Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
竹天卫
tianjin-cement
Commits
0f2f4795
Commit
0f2f4795
authored
Oct 22, 2020
by
mengbali153
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
培训计划
parent
8060cfe6
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
8 deletions
+31
-8
PlanPeopleController.java
...e/sc/cement/business/controller/PlanPeopleController.java
+2
-2
PlanPeopleMapper.java
...a/cn/wise/sc/cement/business/mapper/PlanPeopleMapper.java
+1
-1
PlanPeopleMapper.xml
...n/wise/sc/cement/business/mapper/xml/PlanPeopleMapper.xml
+20
-0
IPlanPeopleService.java
...n/wise/sc/cement/business/service/IPlanPeopleService.java
+1
-1
PlanPeopleServiceImpl.java
...c/cement/business/service/impl/PlanPeopleServiceImpl.java
+7
-4
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanPeopleController.java
View file @
0f2f4795
...
...
@@ -31,9 +31,9 @@ public class PlanPeopleController {
@ApiOperation
(
value
=
"培训计划审批分页"
)
@GetMapping
(
"/getPage"
)
public
BaseResponse
getPage
(
PageQuery
pageQuery
)
{
public
BaseResponse
getPage
(
PageQuery
pageQuery
,
Integer
planId
)
{
try
{
return
iPlanPeopleService
.
getPage
(
pageQuery
);
return
iPlanPeopleService
.
getPage
(
pageQuery
,
planId
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"培训计划分页{}"
,
e
);
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanPeopleMapper.java
View file @
0f2f4795
...
...
@@ -20,5 +20,5 @@ import java.util.Map;
* @since 2020-10-20
*/
public
interface
PlanPeopleMapper
extends
BaseMapper
<
PlanPeople
>
{
// IPage<PlanPeopleVo> getPage(@Param("page") Page page
);
IPage
<
PlanPeopleVo
>
getPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanP
ope
leMapper.xml
→
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanP
eop
leMapper.xml
View file @
0f2f4795
...
...
@@ -2,5 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.wise.sc.cement.business.mapper.PlanPeopleMapper"
>
<sql
id=
"where"
>
<where>
<if
test=
"params.planId != null "
>
and pp.plan_id = #{params.planId}
</if>
</where>
</sql>
<select
id=
"getPage"
resultType=
"cn.wise.sc.cement.business.model.vo.PlanPeopleVo"
>
select pp.id,pp.name,pp.account,pp.status,pp.alias
from plan_people pp
<include
refid=
"where"
/>
order by pp.id asc
</select>
</mapper>
\ No newline at end of file
cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanPeopleService.java
View file @
0f2f4795
...
...
@@ -22,7 +22,7 @@ public interface IPlanPeopleService extends IService<PlanPeople> {
* @param pageQuery 培训计划分页
* @return IPage<PlanTraining>
*/
BaseResponse
<
IPage
<
PlanPeople
>>
getPage
(
PageQuery
pageQuery
);
BaseResponse
<
IPage
<
PlanPeople
Vo
>>
getPage
(
PageQuery
pageQuery
,
Integer
planId
);
/**
* 获取指定时间内的培训计划
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanPeopleServiceImpl.java
View file @
0f2f4795
...
...
@@ -59,10 +59,13 @@ public class PlanPeopleServiceImpl extends ServiceImpl<PlanPeopleMapper, PlanPeo
@Override
public
BaseResponse
<
IPage
<
PlanPeople
>>
getPage
(
PageQuery
pageQuery
)
{
// Page<PlanPeopleVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage
<
PlanPeople
>
iPage
=
new
Page
<>(
pageQuery
.
getPageNo
(),
pageQuery
.
getPageSize
());
IPage
<
PlanPeople
>
pages
=
this
.
page
(
iPage
);
public
BaseResponse
<
IPage
<
PlanPeopleVo
>>
getPage
(
PageQuery
pageQuery
,
Integer
planId
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"planId"
,
planId
);
Page
<
PlanPeopleVo
>
page
=
new
Page
<>(
pageQuery
.
getPageNo
(),
pageQuery
.
getPageSize
());
IPage
<
PlanPeopleVo
>
pages
=
planPeopleMapper
.
getPage
(
page
,
params
);
// IPage<PlanPeople> iPage = new Page<>(pageQuery.getPageNo(),pageQuery.getPageSize());
// IPage<PlanPeople> pages = this.page(iPage);
return
BaseResponse
.
okData
(
pages
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment