From 4ac8b8d51cb9a255a6a36fa060068f4d53adb534 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, 28 Oct 2020 10:18:10 +0800 Subject: [PATCH 1/3] fix --- .../controller/AssessManagerController.java | 12 ++--- .../performance/req/AssessChangeReq.java | 2 +- .../service/AssessManagerService.java | 3 +- .../impl/AssessManagerServiceImpl.java | 45 +++++++++++++++++-- 4 files changed, 51 insertions(+), 11 deletions(-) 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 d72ecff6..756e545d 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -2,6 +2,7 @@ package com.lz.modules.performance.controller; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; +import com.lz.common.utils.StringUtil; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.performance.req.AssessChangeReq; @@ -86,12 +87,13 @@ public class AssessManagerController { if(req.getChangeType()==null){ return R.error("变动类型无效"); } - FlowStart flowStart = flowStartMapper.selectFlowStartById(req.getStartId()); - if(flowStart == null){ - return R.error("暂无此考核组信息"); + if(StringUtil.isBlank(req.getStaffIds())){ + return R.error("变动人员不能为空"); + } + String errorMsg = assessManagerService.assessChange(req); + if(StringUtil.isNotBlank(errorMsg)){ + return R.error(errorMsg); } - flowStart.getGroupIds(); - assessManagerService.assessChange(req); return R.ok(); } diff --git a/src/main/java/com/lz/modules/performance/req/AssessChangeReq.java b/src/main/java/com/lz/modules/performance/req/AssessChangeReq.java index 3595b3be..ad2536fb 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessChangeReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessChangeReq.java @@ -21,6 +21,6 @@ public class AssessChangeReq { private Integer changeType; @ApiModelProperty(value = "变动人员ids",name = "staffIds") - private List staffIds; + private String staffIds; } diff --git a/src/main/java/com/lz/modules/performance/service/AssessManagerService.java b/src/main/java/com/lz/modules/performance/service/AssessManagerService.java index 9f5e49f3..c7d7d06f 100644 --- a/src/main/java/com/lz/modules/performance/service/AssessManagerService.java +++ b/src/main/java/com/lz/modules/performance/service/AssessManagerService.java @@ -15,10 +15,9 @@ public interface AssessManagerService { PageUtils assessList(AssessListReq req); - PageUtils assessDetail(AssessDetailReq req); void accessDelete(FlowStart flowStart); - void assessChange(AssessChangeReq req); + String assessChange(AssessChangeReq req); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 682fa865..3c9c6305 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -3,6 +3,8 @@ package com.lz.modules.performance.service.impl; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; +import com.lz.modules.app.dto.StaffSimpleDto; +import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.EvaluationGroup; import com.lz.modules.flow.entity.FlowStart; @@ -22,9 +24,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; +import static java.util.stream.Collectors.toList; + /** * @Author: djc * @Desc: @@ -40,6 +45,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { private EvaluationGroupService evaluationGroupService; @Autowired private EvaluationStartStaffService evaluationStartStaffService; + @Autowired + private StaffService staffService; @Override public PageUtils assessList(AssessListReq req) { @@ -89,7 +96,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { if(StringUtil.isNotBlank(groupIds)){ String[] split = groupIds.split(","); List ids = Arrays.asList(split); - List collect = ids.stream().map(s -> Long.valueOf(s)).collect(Collectors.toList()); + List collect = ids.stream().map(s -> Long.valueOf(s)).collect(toList()); evaluationGroupService.deleteByIds(collect); } resultRecordMapper.batchDeleteByStartId(flowStart.getId()); @@ -98,15 +105,47 @@ public class AssessManagerServiceImpl implements AssessManagerService { @Override - public void assessChange(AssessChangeReq req) { - + public String assessChange(AssessChangeReq req) { + String ok = StringUtil.EMPTY; + FlowStart flowStart = flowStartMapper.selectFlowStartById(req.getStartId()); + if(flowStart == null){ + return "暂无此考核组信息"; + } + String[] split = flowStart.getGroupIds().split(","); + String[] changeStaffIds = req.getStaffIds().split(","); + List strings = Arrays.asList(split); + List ids = strings.stream().map(s -> Long.valueOf(s)).collect(toList()); + List evaluationGroups = evaluationGroupService.selectEvaluationGroupByIds(ids); + Set staffIds = new HashSet<>(); + for(EvaluationGroup group:evaluationGroups){ + List staff = evaluationGroupService.selectAllStaffIdsByGroupId(group.getId()); + staffIds.addAll(staff); + } + List all = new ArrayList<>(staffIds); + List change = Arrays.asList(changeStaffIds); if(req.getChangeType() == 0){ + //获取不在考评组的人员 + List notInGroup = change.stream().filter(item -> !all.contains(item)).collect(toList()); + if(CollectionUtils.isNotEmpty(notInGroup)){ + List collect = notInGroup.stream().map(s -> Long.valueOf(s)).collect(toList()); + List staffSimpleDtos = staffService.selectStaffSimpleInfoByIds(collect); + String notInGroupNames = StringUtil.EMPTY; + for(StaffSimpleDto dto:staffSimpleDtos){ + notInGroupNames = notInGroupNames + dto.getName() + " "; + } + return notInGroupNames; + } + //初始化添加用户的数据 TODO + + return ok; } if(req.getChangeType() == 1){ + } + return ok; } } From 7546eb5ef490546971ce055bf87fa2a1951604b9 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, 28 Oct 2020 10:48:24 +0800 Subject: [PATCH 2/3] task test --- .../performance/controller/UserTaskController.java | 2 +- .../service/impl/AssessManagerServiceImpl.java | 4 ++-- .../lz/modules/sys/dao/app/ResultRecordMapper.java | 2 ++ src/main/resources/mapper/app/ResultRecordMapper.xml | 12 ++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java index cd99b4d5..9d15de2f 100644 --- a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -29,7 +29,7 @@ public class UserTaskController extends AbstractController{ @ApiOperation("获取待办/处理事项") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ - PageUtils pageUtils = assessService.userTaskList(req, getUserId()); + PageUtils pageUtils = assessService.userTaskList(req, 313L); return R.ok().put("data",pageUtils); } } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 3c9c6305..8dcdfc66 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -142,8 +142,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { } if(req.getChangeType() == 1){ - - + resultRecordMapper.batchDeleteByStartIdAndStaffId(req.getStartId(),change); + return ok; } return ok; 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 8cb6a4de..1ac62e74 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 @@ -88,4 +88,6 @@ public interface ResultRecordMapper extends BaseMapper { List selectAssessListByStartId(@Param("page") IPage page, @Param("req")AssessDetailReq req); List countAssessNumByFlowProcess(@Param("req")AssessDetailReq req); + + void batchDeleteByStartIdAndStaffId(@Param("startId")Long startId,@Param("staffIds") List staffIds); } \ No newline at end of file diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 0875ce92..93c566d2 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -449,5 +449,17 @@ GROUP BY flow_process + + + update lz_result_record set is_delete = 1 where + is_delete = 0 + and start_id = #{startId} + and staff_id in ( + + #{staff_id} + + ) + + From 2b2ab2ff07a79863ac46ae7f13d2470bf1f8de02 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, 28 Oct 2020 11:06:32 +0800 Subject: [PATCH 3/3] fix --- .../lz/modules/performance/req/ChartResultReq.java | 4 ++-- .../performance/res/AssessManagerDetailRes.java | 11 +++++++++++ .../service/impl/ChartResultServiceImpl.java | 2 +- .../lz/modules/sys/dao/app/ResultRecordMapper.java | 2 +- src/main/resources/mapper/app/ResultRecordMapper.xml | 6 +++--- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java index 5d49ac0c..89921e5e 100644 --- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java @@ -20,6 +20,6 @@ public class ChartResultReq extends BasePage{ @ApiModelProperty(value = "考核id",name = "startId") private Long startId; - @ApiModelProperty(value = "状态",name = "flowProcess") - private Long flowProcess; + @ApiModelProperty(value = "等级",name = "scoreLevel") + private Long scoreLevel; } diff --git a/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java b/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java index 81b67935..cc80f341 100644 --- a/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java +++ b/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java @@ -1,5 +1,7 @@ package com.lz.modules.performance.res; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; @@ -11,15 +13,24 @@ import java.util.List; * @Date: 2020/10/21 11:35 */ @Data +@ApiModel("考核详情列表实体") public class AssessManagerDetailRes { + @ApiModelProperty(value = "姓名",name = "staffName") private String staffName; + @ApiModelProperty(value = "部门名称",name = "departmentName") private String departmentName; + @ApiModelProperty(value = "考核组",name = "evaluationName") private String evaluationName; + @ApiModelProperty(value = "考核结果",name = "allScore") private String allScore; + @ApiModelProperty(value = "绩效等级",name = "scoreLevel") private String scoreLevel; + + @ApiModelProperty(value = "id",name = "id") + private Long id; } 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 9a2a18f2..3beeeca5 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 @@ -138,7 +138,7 @@ public class ChartResultServiceImpl implements ChartResultService { List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); List ids = staffService.staffsByAllDeparmentIds(allDeparmentIds); PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( - page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId(),req.getFlowProcess()) + page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId(),req.getScoreLevel()) ); return pageUtils; } 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 1ac62e74..91ac06e9 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 @@ -77,7 +77,7 @@ public interface ResultRecordMapper extends BaseMapper { List countNumByScoreLevel(@Param("startId") Long startId); - List selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List staffIds, @Param("startId")Long startId,@Param("flowProcess")Long flowProcess); + List selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List staffIds, @Param("startId")Long startId,@Param("scoreLevel")Long scoreLevel); void batchDeleteByStartId(@Param("startId")Long startId); diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 93c566d2..19403641 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -373,8 +373,8 @@ ) - - and r.flow_process = #{flowProcess} + + and r.score_level = #{scoreLevel} ORDER BY all_score desc @@ -395,7 +395,7 @@