Commit 0f2f4795 authored by mengbali153's avatar mengbali153

培训计划

parent 8060cfe6
...@@ -31,9 +31,9 @@ public class PlanPeopleController { ...@@ -31,9 +31,9 @@ public class PlanPeopleController {
@ApiOperation(value = "培训计划审批分页") @ApiOperation(value = "培训计划审批分页")
@GetMapping("/getPage") @GetMapping("/getPage")
public BaseResponse getPage(PageQuery pageQuery) { public BaseResponse getPage(PageQuery pageQuery,Integer planId) {
try { try {
return iPlanPeopleService.getPage(pageQuery); return iPlanPeopleService.getPage(pageQuery,planId);
} catch (Exception e) { } catch (Exception e) {
log.debug("培训计划分页{}", e); log.debug("培训计划分页{}", e);
} }
......
...@@ -20,5 +20,5 @@ import java.util.Map; ...@@ -20,5 +20,5 @@ import java.util.Map;
* @since 2020-10-20 * @since 2020-10-20
*/ */
public interface PlanPeopleMapper extends BaseMapper<PlanPeople> { 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);
} }
...@@ -2,5 +2,19 @@ ...@@ -2,5 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <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> </mapper>
\ No newline at end of file
...@@ -22,7 +22,7 @@ public interface IPlanPeopleService extends IService<PlanPeople> { ...@@ -22,7 +22,7 @@ public interface IPlanPeopleService extends IService<PlanPeople> {
* @param pageQuery 培训计划分页 * @param pageQuery 培训计划分页
* @return IPage<PlanTraining> * @return IPage<PlanTraining>
*/ */
BaseResponse<IPage<PlanPeople>> getPage(PageQuery pageQuery); BaseResponse<IPage<PlanPeopleVo>> getPage(PageQuery pageQuery,Integer planId);
/** /**
* 获取指定时间内的培训计划 * 获取指定时间内的培训计划
......
...@@ -59,10 +59,13 @@ public class PlanPeopleServiceImpl extends ServiceImpl<PlanPeopleMapper, PlanPeo ...@@ -59,10 +59,13 @@ public class PlanPeopleServiceImpl extends ServiceImpl<PlanPeopleMapper, PlanPeo
@Override @Override
public BaseResponse<IPage<PlanPeople>> getPage(PageQuery pageQuery) { public BaseResponse<IPage<PlanPeopleVo>> getPage(PageQuery pageQuery,Integer planId) {
// Page<PlanPeopleVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize()); Map<String, Object> params = new HashMap<>();
IPage<PlanPeople> iPage = new Page<>(pageQuery.getPageNo(),pageQuery.getPageSize()); params.put("planId", planId);
IPage<PlanPeople> pages = this.page(iPage); 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); return BaseResponse.okData(pages);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment