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 823ff78b..530693fb 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 @@ -39,6 +39,8 @@ public interface ResultRecordMapper extends BaseMapper { int deleteResultRecordById(@Param("id") Long id); + int deleteResultRecordById2(@Param("id") Long id); + List selectByCondition(@Param("page") IPage page, @Param("req") ResultRecordReq req); diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index ef5f1553..540a4606 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -45,6 +45,7 @@ public interface ResultRecordService extends IService { int deleteResultRecordById(Long id); + int deleteResultRecordById2(Long id); R queryPage(ResultRecordReq params, SysUserEntity user); diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 945b50e3..82d34c42 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -150,6 +150,11 @@ public class ResultRecordServiceImpl extends ServiceImpl departmentIds = new ArrayList<>(); @@ -353,7 +358,7 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(oldResultRecordId); for(FlowRecord flowRecord : flowRecords){ flowRecord.setRecordId(resultRecordOld.getId()); diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 5e2c7236..fd8e9750 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -135,6 +135,12 @@ + + update lz_result_record set is_delete = 2 where id=#{id} limit 1 + + + +