From f7330346dbac7a38bd51c50d80d4d1b5301ed690 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 3 Dec 2020 14:17:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E5=80=BE?= =?UTF-8?q?=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/flow/dao/ResultScoreMapper.java | 2 ++ .../flow/service/ResultScoreService.java | 2 ++ .../service/impl/ResultScoreServiceImpl.java | 5 +++++ .../sys/dao/app/ResultDetailMapper.java | 2 ++ .../sys/service/app/ResultDetailService.java | 2 ++ .../sys/service/app/ResultRecordService.java | 2 +- .../app/impl/ResultDetailServiceImpl.java | 5 +++++ .../app/impl/ResultRecordServiceImpl.java | 20 ++++++++++++++++++- .../mapper/app/ResultDetailMapper.xml | 4 ++++ .../mapper/flow/ResultScoreMapper.xml | 4 ++++ 10 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/ResultScoreMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultScoreMapper.java index 8647cc54..bcd3f384 100644 --- a/src/main/java/com/lz/modules/flow/dao/ResultScoreMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/ResultScoreMapper.java @@ -37,4 +37,6 @@ public interface ResultScoreMapper extends BaseMapper { List selectResultScoresByDetailId(@Param("id") Long id); List selectResultScoresByDetailIdAndOrderByStaffIds(@Param("id") Long id, @Param("list") List scoreDtos); + + int deleteResultScoreByDetailId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/ResultScoreService.java b/src/main/java/com/lz/modules/flow/service/ResultScoreService.java index 7b1a520c..f7dd4358 100644 --- a/src/main/java/com/lz/modules/flow/service/ResultScoreService.java +++ b/src/main/java/com/lz/modules/flow/service/ResultScoreService.java @@ -36,4 +36,6 @@ public interface ResultScoreService extends IService { List selectResultScoresByDetailId(Long id); List selectResultScoresByDetailIdAndOrderByStaffIds(Long id, List scoreDtos); + + int deleteResultScoreByDetailId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultScoreServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/ResultScoreServiceImpl.java index 6a006cd6..45818187 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/ResultScoreServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/ResultScoreServiceImpl.java @@ -71,6 +71,11 @@ public class ResultScoreServiceImpl extends ServiceImpl { Long insertResultDetails(@Param("list") List resultDetails); List selectDtosByRecordId(@Param("recordResultId") Long id, @Param("modelId") Long modelId); + + int deleteResultDetailByRecordId(@Param("recordId") Long recordId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java index f7360a95..b79f45d5 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java @@ -70,4 +70,6 @@ public interface ResultDetailService extends IService { Long insertResultDetails(List resultDetails); List selectDtosByRecordId(Long id, Long modelId); + + int deleteResultDetailByRecordId(Long recordId); } \ No newline at end of file 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 416f9af8..103eed3e 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 @@ -128,5 +128,5 @@ public interface ResultRecordService extends IService { R getResetData(RecordDetailDto recordDetailDto); - R resetData(Long recordId); + R resetData(Long recordId, int clearAll); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java index f337f388..fb2193bf 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java @@ -340,4 +340,9 @@ public class ResultDetailServiceImpl extends ServiceImpl resultDetails = resultDetailService.selectByRecordId(recordId); + log.info("需要删除指标个数{}", resultDetails.size()); + if(clearAll == 1){ + log.info("全部清空，删除所有指标即可"); + resultDetailService.deleteResultDetailByRecordId(recordId); + //return R.ok(); + } + //删除指标以外的所有数据，评分、评分说明、结果 + + for(ResultDetail detail : resultDetails){ + detail.setCheckResult(null); + detail.setAcquireScore(null); + detail.setSuperScore(null); + resultScoreService.deleteResultScoreByDetailId(detail.getId()); + } return null; } } diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml index 796d3504..da34a43f 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -189,5 +189,9 @@ select * from lz_result_detail where record_id=#{recordResultId} and model_id = #{modelId} and is_delete = 0 order by priority asc + + update lz_result_detail set is_delete = 1, gmt_modified = now() where record_id=#{recordId} and is_delete = 0 + + diff --git a/src/main/resources/mapper/flow/ResultScoreMapper.xml b/src/main/resources/mapper/flow/ResultScoreMapper.xml index fc708796..ac8203bb 100644 --- a/src/main/resources/mapper/flow/ResultScoreMapper.xml +++ b/src/main/resources/mapper/flow/ResultScoreMapper.xml @@ -101,5 +101,9 @@ ) + + update lz_result_score set is_delete = 1, gmt_modified = now() where detail_id=#{id} and is_delete = 0 + + From 59550c4dfbd227196fc9cc41efbff7653b40af65 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 3 Dec 2020 14:27:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/impl/ResultRecordServiceImpl.java | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) 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 ad1a51cd..f5fc034b 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 @@ -1447,20 +1447,29 @@ public class ResultRecordServiceImpl extends ServiceImpl resultDetails = resultDetailService.selectByRecordId(recordId); - log.info("需要删除指标个数{}", resultDetails.size()); - if(clearFlag == 1){ - log.info("全部清空，删除所有指标即可"); - resultDetailService.deleteResultDetailByRecordId(recordId); - //return R.ok(); - } - //删除指标以外的所有数据，评分、评分说明、结果 - for(ResultDetail detail : resultDetails){ - detail.setCheckResult(null); - detail.setAcquireScore(null); - detail.setSuperScore(null); - resultScoreService.deleteResultScoreByDetailId(detail.getId()); + log.info("需要删除指标个数{}", resultDetails.size()); + if(resultDetails.size() > 0){ + if(clearFlag == 1){ + log.info("全部清空，删除所有指标即可"); + resultDetailService.deleteResultDetailByRecordId(recordId); + for(ResultDetail detail : resultDetails){ + resultScoreService.deleteResultScoreByDetailId(detail.getId()); + } + return R.ok(); + } + //删除指标以外的所有数据，评分、评分说明、结果 + + for(ResultDetail detail : resultDetails){ + detail.setCheckResult(null); + detail.setAcquireScore(null); + detail.setSuperScore(null); + resultScoreService.deleteResultScoreByDetailId(detail.getId()); + } + resultDetailService.updateBatchById(resultDetails); + return R.ok(); } + return R.error("无数据删除"); } }