From 5d90b5ccfb2ca5e4e2dee9c1ce5e81d411487c70 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 26 Oct 2020 09:16:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E8=80=83=E6=A0=B8=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlowStartController.java | 68 +++++++++++-------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java index 9d08eac4..d3031e1f 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -191,14 +191,6 @@ public class FlowStartController { return R.error(evaluationGroup.getName() + "——没有设置绩效管理人员"); } - for (ResultModelDto dto:resultModelDtos - ) { - - - List libDtos = resultTagetLibService.selectResultTagetLibDtoByModelId(dto.getId()); - dto.setTagetLibs(libDtos); - } - //下面拷贝一份考评组信息发起后所使用的考评组id为复制后的id evaluationGroup.setCopyId(evaluationGroup.getId()); evaluationGroup.setId(null); @@ -206,6 +198,40 @@ public class FlowStartController { evaluationGroup.setGmtModified(null); evaluationGroupService.insertEvaluationGroup(evaluationGroup); + //拷贝考评组的指标信息 + List resultTagetLibs = new ArrayList<>(); + + for (ResultModelDto dto:resultModelDtos + ) { + + + dto.setEvaluationGroupId(evaluationGroup.getId());//设置拷贝组的id + //下面拷贝一份考评组信息的维度信息 + ResultModel resultModel = new ResultModel(); + BeanUtils.copyProperties(dto, resultModel); + resultModel.setId(null); + resultModelService.insertResultModel(resultModel); + + List libDtos = resultTagetLibService.selectResultTagetLibDtoByModelId(dto.getId()); + dto.setTagetLibs(libDtos); + for (ResultTagetLibDto libDto: libDtos + ) { + //下面拷贝考评组里面的指标信息 + ResultTagetLib resultTagetLib = new ResultTagetLib(); + BeanUtils.copyProperties(libDto, resultTagetLib); + resultTagetLib.setModelId(resultModel.getId());//设置新的维度id + resultTagetLib.setId(null); + resultTagetLibs.add(resultTagetLib); + } + } + if(resultTagetLibs.size() > 0){ + //插入备份的考评组指标信息 + resultTagetLibService.insertResultTagetLibs(resultTagetLibs); + } + + + + //下面初始化lz_flow流程表 lz_flow_approval_role流程审批表 List flowApprovalRoles = new ArrayList<>(); int stepIndex = 0; @@ -224,7 +250,7 @@ public class FlowStartController { chartNameMaps.put(flowChart.getId(), flowChart.getName()); optName = flowChart.getName(); } - flow.setOpt(optName); + flow.setOptDesc(optName); flowService.insertFlow(flow); if(flowChartDetailRecord.getOptType().intValue() == ChartOptType.APPOINT.getCode()){//指定人员的 @@ -269,8 +295,7 @@ public class FlowStartController { //初始化lz_result_details数据 List resultDetails = new ArrayList<>(); - //拷贝考评组的指标信息 - List resultTagetLibs = new ArrayList<>(); + List evaluationStartStaffs = new ArrayList<>(); @@ -281,7 +306,7 @@ public class FlowStartController { evaluationStartStaff.setEvaluationId(evaluationGroup.getId()); evaluationStartStaff.setEvaluationName(evaluationGroup.getName()); evaluationStartStaff.setStaffId(entity.getId()); - evaluationStartStaff.setStaffId(flowStart.getId()); + evaluationStartStaff.setStartId(flowStart.getId()); evaluationStartStaff.setType(CheckStaffType.MANAGER.getCode()); evaluationStartStaffs.add(evaluationStartStaff); @@ -295,7 +320,7 @@ public class FlowStartController { evaluationStartStaff.setEvaluationId(evaluationGroup.getId()); evaluationStartStaff.setEvaluationName(evaluationGroup.getName()); evaluationStartStaff.setStaffId(staffInfo.getId()); - evaluationStartStaff.setStaffId(flowStart.getId()); + evaluationStartStaff.setStartId(flowStart.getId()); evaluationStartStaff.setType(CheckStaffType.STAFF.getCode()); evaluationStartStaffs.add(evaluationStartStaff); @@ -395,22 +420,12 @@ public class FlowStartController { //下面生成ResultDetail对象 for (ResultModelDto modelDto:resultModelDtos ) { - ////下面拷贝一份考评组信息的维度信息 - ResultModel resultModel = new ResultModel(); - BeanUtils.copyProperties(modelDto, resultModel); - modelDto.setEvaluationGroupId(evaluationGroup.getId());//设置拷贝组的id - resultModel.setId(null); - resultModelService.insertResultModel(resultModel); + if(modelDto.getTagetLibs() != null && modelDto.getTagetLibs().size() > 0){//模板里面有添加指标 for (ResultTagetLibDto libDto: modelDto.getTagetLibs()) { - //下面拷贝考评组里面的指标信息 - ResultTagetLib resultTagetLib = new ResultTagetLib(); - BeanUtils.copyProperties(libDto, resultTagetLib); - resultTagetLib.setModelId(resultModel.getId());//设置新的维度id - resultTagetLib.setId(null); - resultTagetLibs.add(resultTagetLib); + ResultDetail resultDetail = new ResultDetail(); resultDetail.setRecordId(resultRecord.getId()); @@ -429,8 +444,7 @@ public class FlowStartController { if(resultDetails.size() > 0){ // resultDetailService.insertResultDetails(resultDetails); - //插入备份的考评组指标信息 - resultTagetLibService.insertResultTagetLibs(resultTagetLibs); + } From c6af248f12268b1d11ca5f9b3008bc3ccd4b8f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 26 Oct 2020 09:59:52 +0800 Subject: [PATCH 2/7] fix --- .../java/com/lz/modules/sys/dao/app/ResultRecordMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d83f3e3c..dd49703e 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 @@ -18,6 +18,7 @@ import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.flow.model.ResultRecordDto; import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.req.ChartResultReq; +import com.lz.modules.performance.res.AssessManagerDetailRes; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.sys.entity.app.ResultRecord; import org.apache.ibatis.annotations.Mapper; @@ -85,5 +86,5 @@ public interface ResultRecordMapper extends BaseMapper { ResultRecord selectOneByStartId(@Param("startId")Long startId); - List selectAssessListByStartId(@Param("page") IPage page,@Param("startId")Long startId); + List selectAssessListByStartId(@Param("page") IPage page, @Param("startId")Long startId); } \ No newline at end of file From f1b01745cf51a9c8283a6fdf438b24f4d70b3f55 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 26 Oct 2020 10:22:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9A=90=E8=97=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/performance/controller/FlowStartController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java index d3031e1f..002b9886 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -269,8 +269,8 @@ public class FlowStartController { flowApprovalRoles.add(flowApprovalRole); flowApprovalRole.setStepIndex(stepIndex); } - stepIndex++; } + stepIndex++; }else{ String[] roleIds = flowChartDetailRecord.getRoleIds().split(","); for (String roleId:roleIds From 9b9abc0f2efb95fa3ddc68686685d71017cc9400 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 26 Oct 2020 10:29:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=B0=8F=E6=B5=81=E7=A8=8B=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E4=BF=9D=E5=AD=98=E5=85=B3=E9=97=AD=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/performance/controller/FlowChartController.java | 2 ++ src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java index 2fc31be5..0eb0cd4b 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -150,12 +150,14 @@ public class FlowChartController { flowChartDetailRecord.setChartId(flowChartDetailRecordListReq.getId()); flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId()); flowChartDetailRecord.setStepIndex(index); + flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus()); if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){ updaes.add(flowChartDetailRecord); }else{ inserts.add(flowChartDetailRecord); } if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){ + //本节点没有删除，那么顺序++ index++; } diff --git a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml index 499d9267..0206b2a5 100644 --- a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml @@ -110,7 +110,7 @@ From b2ab60cb16784ec9f7b1e1f97d7dc1f8979c7080 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 26 Oct 2020 11:27:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E8=80=83=E6=A0=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/performance/controller/FlowStartController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java index 002b9886..3dee17b9 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -125,13 +125,15 @@ public class FlowStartController { if(flowStart1 == null){ flowStartService.insertFlowStart(flowStart); }else{ - flowStart = flowStart1; + + flowStart.setId(flowStart1.getId()); } Map chartNameMaps = new HashedMap();//流程节点与流程名称对应map，下面多次循环，减少数据库查找 Map> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找 //下面开始初始化流程 + String[] gids = flowStart.getGroupIds().split(","); List ids = Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function() { @Override public Long apply(String s) {