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/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java index 394fa38c..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,10 +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{ + inserts.add(flowChartDetailRecord); } if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){ 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}