From 5d90b5ccfb2ca5e4e2dee9c1ce5e81d411487c70 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 26 Oct 2020 09:16:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E8=B5=B7=E8=80=83?= =?UTF-8?q?=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); + }