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 4537e655..3465842a 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -76,7 +76,10 @@ 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") int processId); + int batchUpdateSkip(@Param("recordIds")List recordIds); List selectFlowRecordByRecordIdFlowProcess(@Param("id") Long id, @Param("flowProcess") int flowProcess); + + int batchDeleteByRecordIds(@Param("recordIds")List recordIds); + } \ 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 39fa2115..61347731 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 @@ -80,8 +80,6 @@ public class AssessManagerServiceImpl implements AssessManagerService { @Autowired private DingtalkBusiness dingtalkBusiness; - public static final int processId = 1; - @Override @@ -165,7 +163,14 @@ public class AssessManagerServiceImpl implements AssessManagerService { //删除副本组 evaluationGroupService.deleteByCopyIds(collect,flowStart.getId()); } - resultRecordMapper.batchDeleteByStartId(flowStart.getId()); + List ids = resultRecordMapper.selectIdsByStartId(flowStart.getId()); + if(CollectionUtils.isNotEmpty(ids)){ + log.info("删除resultRecordIds: " + JSON.toJSONString(ids)); + resultRecordMapper.batchDeleteByResultRecordIds(ids); + //删除flowRecord + flowRecordMapper.batchDeleteByRecordIds(ids); + } + return ; } @@ -317,7 +322,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { List collect = objects.stream().map(o -> Long.valueOf(String.valueOf(o))).collect(toList()); - int updateExecution = flowRecordMapper.batchUpdateExecution(collect, processId); + int updateExecution = flowRecordMapper.batchUpdateSkip(collect); log.info("更新flowRecord记录,i:" + updateExecution); } 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 0efff89b..9d97e66f 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 @@ -101,4 +101,9 @@ public interface ResultRecordMapper extends BaseMapper { ResultRecord selectLastResultRecordByUserId(@Param("userId") Long userId); ResultRecord selectResultRecordByStaffIdAndStartId(@Param("userId") Long userId, @Param("startId") Long startId); + + List selectIdsByStartId(@Param("startId")Long startId); + + int batchDeleteByResultRecordIds(@Param("resultRecordIds")List resultRecordIds); + } \ No newline at end of file diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 04fd795b..77a47e5a 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -594,5 +594,21 @@ + + + + + update lz_result_record set is_delete = 1 where + is_delete = 0 + and id in ( + + #{id} + + ) + diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index aa192578..3a69bfa1 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -266,23 +266,34 @@ select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and id > #{id} and status = #{status} order by id asc limit 1 - + UPDATE lz_flow_record SET status = 4 ,gmt_modified = now() - where is_delete = 0 and status !=4 and flow_process = 2 and process_id = #{processId} - - and record_id in ( - - #{record_id} - - ) - + where is_delete = 0 and status !=4 and flow_process = 2 + and record_id in ( + + #{record_id} + + ) + + + UPDATE lz_flow_record + SET is_delete = 1, + ,gmt_modified = now() + where is_delete = 0 + and record_id in ( + + #{record_id} + + ) + +