From 662c38011bfbc375985a2b633568d1e4d4a90b59 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 22 Oct 2020 12:07:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/EvaluationStartStaffMapper.xml | 23 ++++----- .../flow/FlowChartDetailRecordMapper.xml | 47 ++++++++++--------- .../mapper/flow/ResultTagetLibMapper.xml | 31 ++++++------ 3 files changed, 52 insertions(+), 49 deletions(-) diff --git a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml index 1c8b734b..057ba160 100644 --- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml @@ -84,22 +84,23 @@ update lz_evaluation_start_staff set is_delete = 1 where id=#{id} limit 1 - + insert into lz_evaluation_start_staff( - evaluation_id, - start_id, - staff_id, - type, + evaluation_id, + start_id, + staff_id, + type, is_delete - )values( - #{ item.evaluationId}, - #{ item.startId}, - #{ item.staffId}, - #{ item.type}, + )values + ( + #{ item.evaluationId}, + #{ item.startId}, + #{ item.staffId}, + #{ item.type}, 0 ) - + ; diff --git a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml index 45b13b85..6d1c567a 100644 --- a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml @@ -118,33 +118,34 @@ - - insert into lz_flow_chart_detail_record( - chart_id, - evaluation_group_id, - status, - opt_ids, - opt_type, - role_ids, - step_type, - step_index, - weight, - is_delete - )values( - #{ item.chartId}, - #{ item.evaluationGroupId}, - #{ item.status}, - #{ item.optIds}, - #{ item.optType}, - #{ item.roleIds}, - #{ item.stepType}, - #{ item.stepIndex}, - #{ item.weight}, + insert into lz_flow_chart_detail_record( + chart_id, + evaluation_group_id, + status, + opt_ids, + opt_type, + role_ids, + step_type, + step_index, + weight, + is_delete + )values + ( + + #{ item.chartId}, + #{ item.evaluationGroupId}, + #{ item.status}, + #{ item.optIds}, + #{ item.optType}, + #{ item.roleIds}, + #{ item.stepType}, + #{ item.stepIndex}, + #{ item.weight}, 0 ) - + ; diff --git a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml index 525b46c7..2384cb6b 100644 --- a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml +++ b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml @@ -105,25 +105,26 @@ - - insert into lz_result_taget_lib( - name, - model_id, - weight, - key_result, - order_by, - is_delete - )values( - #{ item.name}, - #{ item.modelId}, - #{ item.weight}, - #{ item.keyResult}, - #{ item.orderBy}, + insert into lz_result_taget_lib( + name, + model_id, + weight, + key_result, + order_by, + is_delete + )values + ( + + #{ item.name}, + #{ item.modelId}, + #{ item.weight}, + #{ item.keyResult}, + #{ item.orderBy}, 0 ) - + ; From cd93891f21e9deff569b1751103503436b4c6ba8 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 22 Oct 2020 15:06:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/dao/ResultTagetLibMapper.java | 3 +++ .../controller/FlowStartController.java | 5 +++- .../controller/ResultModelController.java | 24 ++++++++++++------- .../service/ResultTagetLibService.java | 3 +++ .../impl/ResultTagetLibServiceImpl.java | 6 +++++ .../mapper/flow/ResultTagetLibMapper.xml | 4 ++++ 6 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java index 9823f341..2c891554 100644 --- a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.lz.modules.flow.entity.ResultTagetLib; import com.lz.modules.flow.model.ResultTagetLibDto; +import com.lz.modules.flow.req.ResultTagetLibItemReq; import com.lz.modules.flow.req.ResultTagetLibSearchReq; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -45,4 +46,6 @@ public interface ResultTagetLibMapper extends BaseMapper { int insertResultTagetLibs(@Param("list") List inserts); int updateResultTagetLibByIds(@Param("list") List inserts); + + List selectResultTagetLibByModelReqId(Long id); } \ No newline at end of file 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 9239bb75..a6840361 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -132,7 +132,7 @@ public class FlowStartController { if(evaluationStartStaffs.size() > 0){ evaluationStartStaffService.insertEvaluationStartStaffs(evaluationStartStaffs); //下面初始化lz_flow流程表 lz_flow_approval_role流程审批表 - List flows = new ArrayList<>(); + //List flows = new ArrayList<>(); List flowApprovalRoles = new ArrayList<>(); for (FlowChartDetailRecord flowChartDetailRecord:flowChartDetailRecords ) { @@ -174,6 +174,9 @@ public class FlowStartController { } //插入记录 } + if(flowApprovalRoles.size() > 0){ + + } for (EvaluationStartStaff startStaff:evaluationStartStaffs ) { diff --git a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java index 49a0edd5..1deeff43 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java @@ -36,24 +36,30 @@ public class ResultModelController { @GetMapping("/getByGroupId") @ApiOperation(value="根据考核组id获取模板列表") - @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultModelDto.class)}) + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultModelDetailReq.class)}) public R getByGroupId(@RequestParam @ApiParam("考核组ID") Long id) { //List resultModels = resultModelService.selectResultModelByGroupId(id); - - return R.ok().put("data",getResultModelDto(id)); - } - - private List getResultModelDto(Long id){ + ResultModelDetailReq resultModelDetailReq = new ResultModelDetailReq(); + List modelItems = new ArrayList<>(); List resultModelDtos = resultModelService.selectResultDtoByGroupId(id); for (ResultModelDto dto:resultModelDtos ) { - List libDtos = resultTagetLibService.selectResultTagetLibByModelId(dto.getId()); - dto.setTagetLibs(libDtos); + resultModelDetailReq.setCalculateId(dto.getCalculateId()); + resultModelDetailReq.setEvaluationGroupId(dto.getEvaluationGroupId()); + resultModelDetailReq.setGradeStatus(dto.getGradeStatus()); + ResultModelItemReq itemReq = new ResultModelItemReq(); + BeanUtils.copyProperties(dto, itemReq); + List req = resultTagetLibService.selectResultTagetLibByModelReqId(dto.getId()); + itemReq.setTagetLibItems(req); + modelItems.add(itemReq); } - return resultModelDtos; + resultModelDetailReq.setModelItems(modelItems); + return R.ok().put("data",resultModelDetailReq); } + + @RequestMapping("/getById") public R getById(@RequestBody ResultModel resultModel) { resultModel = resultModelService.selectResultModelById(resultModel.getId()); diff --git a/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java b/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java index 8c4d1851..339066e1 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java @@ -5,6 +5,7 @@ import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.modules.flow.entity.ResultTagetLib; import com.lz.modules.flow.model.ResultTagetLibDto; +import com.lz.modules.flow.req.ResultTagetLibItemReq; import com.lz.modules.flow.req.ResultTagetLibSearchReq; import java.util.List; @@ -45,4 +46,6 @@ public interface ResultTagetLibService extends IService { int insertResultTagetLibs(List inserts); int updateResultTagetLibByIds(List inserts); + + List selectResultTagetLibByModelReqId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java index d78c8013..9dd28d33 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java @@ -7,6 +7,7 @@ import com.lz.modules.flow.dao.ResultTagetLibMapper; import com.lz.modules.flow.entity.ResultModel; import com.lz.modules.flow.entity.ResultTagetLib; import com.lz.modules.flow.model.ResultTagetLibDto; +import com.lz.modules.flow.req.ResultTagetLibItemReq; import com.lz.modules.flow.req.ResultTagetLibSearchReq; import com.lz.modules.flow.service.ResultModelService; import com.lz.modules.performance.service.ResultTagetLibService; @@ -119,6 +120,11 @@ public class ResultTagetLibServiceImpl extends ServiceImpl selectResultTagetLibByModelReqId(Long id){ + return resultTagetLibMapper.selectResultTagetLibByModelReqId(id); + } + } diff --git a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml index 2250590d..26a2337b 100644 --- a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml +++ b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml @@ -143,5 +143,9 @@ + +