From ed4f1e373614c592ede551d7d59f1866bf547eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 21 Oct 2020 18:12:15 +0800 Subject: [PATCH] fix --- .../lz/modules/flow/dao/FlowStartMapper.java | 3 +- .../controller/AssessManagerController.java | 48 ++++++++++++++++--- .../performance/req/AssessDetailReq.java | 29 ++++++++--- .../performance/req/AssessListReq.java | 29 +++-------- .../performance/res/AssessManagerListRes.java | 2 + .../service/impl/ChartResultServiceImpl.java | 13 +---- .../sys/dao/app/ResultRecordMapper.java | 7 ++- .../sys/service/app/ResultRecordService.java | 10 ++-- .../app/impl/ResultRecordServiceImpl.java | 7 ++- .../resources/mapper/flow/FlowStartMapper.xml | 10 +++- 10 files changed, 95 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/FlowStartMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowStartMapper.java index b6f178f4..bde2f8e2 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowStartMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowStartMapper.java @@ -8,6 +8,7 @@ package com.lz.modules.flow.dao; * @since 2020-10-13 */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.lz.modules.flow.entity.FlowStart; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,6 +33,6 @@ public interface FlowStartMapper extends BaseMapper { int deleteFlowStartById(@Param("id")Long id); - List selectListByTime(); + List selectListByTime(@Param("page") IPage page, @Param("cycleType")Integer cycleType,@Param("name")String name); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index 673a1d17..97c36389 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -1,17 +1,24 @@ package com.lz.modules.performance.controller; +import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.modules.flow.dao.FlowStartMapper; -import com.lz.modules.flow.service.FlowStartService; -import com.lz.modules.performance.req.AssessDetailReq; +import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.req.AssessDetailReq; +import com.lz.modules.performance.res.AssessManagerDetailRes; +import com.lz.modules.performance.res.AssessManagerListRes; import com.lz.modules.performance.res.ChartStatisticalRes; -import io.swagger.annotations.ApiParam; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + /** * @Author: djc * @Desc: @@ -27,13 +34,42 @@ public class AssessManagerController { @RequestMapping("assess/manager/list") public R groupList(@RequestBody AssessListReq req){ - ChartStatisticalRes res = new ChartStatisticalRes(); - return R.ok(); + List data = new ArrayList<>() + PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( + page -> flowStartMapper.selectListByTime(page,req.getCycleType(),req.getName()) + ); + List list = pageUtils.getList(); + if(CollectionUtils.isEmpty(list)){ + return R.ok().put("data",pageUtils); + } + list.forEach(flowStart -> { + AssessManagerListRes res = new AssessManagerListRes(); + res.setId(flowStart.getId()); + res.setName(flowStart.getName()); + if(flowStart.getCycleType()==0){ + + }else if(flowStart.getCycleType()==1){ + + } + res.setJoinNum(""); + data.add(res); + }); + + PageUtils pages = new PageUtils(); + pages.setTotalPage(pageUtils.getTotalPage()); + pages.setTotalCount(pageUtils.getTotalCount()); + pages.setCurrPage(req.getCurrPage()); + pages.setPageSize(req.getPageSize()); + pages.setList(data); + return R.ok().put("data",pages); } @RequestMapping("assess/manager/detail") public R groupDetail(@RequestBody AssessDetailReq req){ - ChartStatisticalRes res = new ChartStatisticalRes(); + + AssessManagerDetailRes res = new AssessManagerDetailRes(); + return R.ok(); + } } diff --git a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java index 49903067..054977b0 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java @@ -1,16 +1,33 @@ package com.lz.modules.performance.req; +import com.lz.modules.equipment.entity.model.BasePage; import lombok.Data; +import java.util.List; + /** * @Author: djc * @Desc: - * @Date: 2020/10/13 18:20 + * @Date: 2020/10/13 18:00 */ @Data -public class AssessDetailReq { - //考核类型 月度 季度 - private int assessType; - //组名称 - private String groupName; +public class AssessDetailReq extends BasePage{ + //考勤组id + private Long groupId; + + private String month; + + private String startTime; + + private String endTime; + //周期类型 + private int type; + //员工名称 + private String staffName; + //部门ids数组 + private List departments; + //人员id数组 + private List staffIds; + //状态 确认 执行 结果录入。。。 + private int status; } diff --git a/src/main/java/com/lz/modules/performance/req/AssessListReq.java b/src/main/java/com/lz/modules/performance/req/AssessListReq.java index c5bf4ae0..488ebadb 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessListReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessListReq.java @@ -1,32 +1,17 @@ package com.lz.modules.performance.req; +import com.lz.modules.equipment.entity.model.BasePage; import lombok.Data; -import java.util.List; - /** * @Author: djc * @Desc: - * @Date: 2020/10/13 18:00 + * @Date: 2020/10/13 18:20 */ @Data -public class AssessListReq { - //考勤组id - private Long groupId; - - private String month; - - private String startTime; - - private String endTime; - //周期类型 - private int type; - //员工名称 - private String staffName; - //部门ids数组 - private List departments; - //人员id数组 - private List staffIds; - //状态 确认 执行 结果录入。。。 - private int status; +public class AssessListReq extends BasePage { + //考核类型 月度 季度 + private int cycleType; + //组名称 + private String name; } diff --git a/src/main/java/com/lz/modules/performance/res/AssessManagerListRes.java b/src/main/java/com/lz/modules/performance/res/AssessManagerListRes.java index 69e12d54..84bc7288 100644 --- a/src/main/java/com/lz/modules/performance/res/AssessManagerListRes.java +++ b/src/main/java/com/lz/modules/performance/res/AssessManagerListRes.java @@ -10,6 +10,8 @@ import lombok.Data; @Data public class AssessManagerListRes { + private Long id; + private String name; private String cycleTime; diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index a9f9a10e..aa29e516 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -1,34 +1,25 @@ package com.lz.modules.performance.service.impl; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Maps; import com.lz.common.utils.PageUtils; -import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; -import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.app.service.StaffService; -import com.lz.modules.flow.entity.EvaluationGroup; import com.lz.modules.flow.service.EvaluationGroupService; -import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; -import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.dao.app.ResultRecordMapper; -import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultRecordService; -import com.qcloud.cos.http.RequestBodyValue; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.ArrayUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; -import java.util.function.Consumer; /** * @Author: djc @@ -52,7 +43,7 @@ public class ChartResultServiceImpl implements ChartResultService { @Override public List chartReport(ChartResultReq req) { List data = new ArrayList<>(); - AssessListReq query = new AssessListReq(); + AssessDetailReq query = new AssessDetailReq(); ChartStatisticalRes res; BeanUtils.copyProperties(req,query); diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index eee162d5..6664f7d8 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -16,10 +16,9 @@ import com.lz.modules.app.req.ReportListReq; import com.lz.modules.app.req.ResultRecordReq; import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.flow.model.ResultRecordDto; -import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.ChartStatistical; -import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.sys.entity.app.ResultRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -74,9 +73,9 @@ public interface ResultRecordMapper extends BaseMapper { List selectResultRecordAllByStaffId(@Param("staffId") Long staffId); - List countNumByFlowProcess(@Param("req") AssessListReq req); + List countNumByFlowProcess(@Param("req") AssessDetailReq req); - List countNumByScoreLevel(@Param("req") AssessListReq req); + List countNumByScoreLevel(@Param("req") AssessDetailReq req); List selectResultRankList(@Param("page") IPage page, @Param("req") ChartResultReq req); diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index b6770d27..2c6ce9ad 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -1,12 +1,9 @@ package com.lz.modules.sys.service.app; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.emun.WorkMsgTypeEnum; -import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.modules.app.dto.GraphicsStatisticalDto; -import com.lz.modules.app.dto.ReportProgressListDto; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; @@ -15,9 +12,8 @@ import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.app.utils.t.TwoTuple; import com.lz.modules.flow.entity.Flow; import com.lz.modules.flow.model.StaffRoleDto; -import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.res.ChartStatistical; -import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultRecord; @@ -105,8 +101,8 @@ public interface ResultRecordService extends IService { List selectResultRecordAllByStaffId(Long staffId); - List countNumByFlowProcess(AssessListReq req); + List countNumByFlowProcess(AssessDetailReq req); - List countNumByScoreLevel(AssessListReq req); + List countNumByScoreLevel(AssessDetailReq req); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index e76f8a71..37022e62 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -27,9 +27,8 @@ import com.lz.modules.flow.model.TypeFlowDto; import com.lz.modules.flow.model.TypeRoleDto; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; -import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.res.ChartStatistical; -import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultDetail; @@ -734,12 +733,12 @@ public class ResultRecordServiceImpl extends ServiceImpl countNumByFlowProcess(AssessListReq req) { + public List countNumByFlowProcess(AssessDetailReq req) { return resultRecordMapper.countNumByFlowProcess(req); } @Override - public List countNumByScoreLevel(AssessListReq req) { + public List countNumByScoreLevel(AssessDetailReq req) { return resultRecordMapper.countNumByScoreLevel(req); } } diff --git a/src/main/resources/mapper/flow/FlowStartMapper.xml b/src/main/resources/mapper/flow/FlowStartMapper.xml index a9795628..68b928cc 100644 --- a/src/main/resources/mapper/flow/FlowStartMapper.xml +++ b/src/main/resources/mapper/flow/FlowStartMapper.xml @@ -88,8 +88,14 @@ update lz_flow_start set is_delete = 1 where id=#{id} limit 1 - + select * from lz_flow_start where is_delete = 0 + + AND cycle_type = #{cycleType} + + + and name LIKE CONCAT('%',#{name},'%') +