From a183e27678b9b57153c5607290ee03c42b5d52e7 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 5 Nov 2020 18:18:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=98=AF=E5=A6=82=E6=9E=9C=E4=B8=8D=E4=BC=A0?= =?UTF-8?q?=E4=B8=8D=E8=B5=B0=E7=B1=BB=E5=9E=8B=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=BE=9D=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/performance/controller/FlowChartController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 394fa38c..d786a24f 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -157,10 +157,14 @@ public class FlowChartController { flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId()); flowChartDetailRecord.setStepIndex(index); + flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus()); if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){ updaes.add(flowChartDetailRecord); }else{ + if(flowChartDetailRecord.getStepType() == null){//添加时默认没有设置步骤类型，那么设置成一次 + flowChartDetailRecord.setStepType(0); + } inserts.add(flowChartDetailRecord); } if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){ From d4738c4da39b46c1a00709ea02af396ce7d05cba Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 5 Nov 2020 18:21:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance/controller/FlowChartController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 d786a24f..2f066aba 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -157,14 +157,14 @@ public class FlowChartController { flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId()); flowChartDetailRecord.setStepIndex(index); - + if(flowChartDetailRecord.getStepType() == null){//添加时默认没有设置步骤类型，那么设置成一次 + flowChartDetailRecord.setStepType(0); + } flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus()); if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){ updaes.add(flowChartDetailRecord); }else{ - if(flowChartDetailRecord.getStepType() == null){//添加时默认没有设置步骤类型，那么设置成一次 - flowChartDetailRecord.setStepType(0); - } + inserts.add(flowChartDetailRecord); } if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){ From 9946d69282b7f089459b6336aca2727efef88a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 6 Nov 2020 09:23:23 +0800 Subject: [PATCH 3/3] fix --- src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java | 2 +- .../performance/service/impl/AssessManagerServiceImpl.java | 2 +- src/main/resources/mapper/flow/FlowRecordMapper.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java index 97d0ffd5..a0126aab 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -76,5 +76,5 @@ public interface FlowRecordMapper extends BaseMapper { FlowRecord selectFlowRecordByRecordIdMinIdStatus(@Param("resultRecordId") Long resultRecordId, @Param("id") Long id, @Param("status") int status); - int batchUpdateExecution(@Param("recordIds")List recordIds,@Param("processId") Long processId); + int batchUpdateExecution(@Param("recordIds")List recordIds,@Param("processId") int processId); } \ No newline at end of file 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 ca2e70f7..05d80216 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 @@ -90,7 +90,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { @Autowired private DingtalkBusiness dingtalkBusiness; - public static final Long processId = 1L; + public static final int processId = 1; diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index a5cfd818..a2b699ae 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -269,6 +269,7 @@ ,gmt_modified = now() where is_delete = 0 and status !=4 and flow_process = 2 and process_id = #{processId} + and record_id in ( #{record_id}