提交修改

src/main/java/com/lz/modules/flow/dao/ResultScoreMapper.java

@@ -37,4 +37,6 @@ public interface ResultScoreMapper extends BaseMapper<ResultScore> {
     List<ResultScore> selectResultScoresByDetailId(@Param("id") Long id);
 
 	List<ResultScore> selectResultScoresByDetailIdAndOrderByStaffIds(@Param("id") Long id, @Param("list") List<ResultScoreDto> scoreDtos);
+
+    int deleteResultScoreByDetailId(Long id);
 }

src/main/java/com/lz/modules/flow/service/ResultScoreService.java

@@ -36,4 +36,6 @@ public interface ResultScoreService extends IService<ResultScore> {
     List<ResultScore> selectResultScoresByDetailId(Long id);
 
     List<ResultScore> selectResultScoresByDetailIdAndOrderByStaffIds(Long id, List<ResultScoreDto> scoreDtos);
+
+    int deleteResultScoreByDetailId(Long id);
 }

src/main/java/com/lz/modules/flow/service/impl/ResultScoreServiceImpl.java

@@ -71,6 +71,11 @@ public class ResultScoreServiceImpl extends ServiceImpl<ResultScoreMapper, Resul
 		return resultScoreMapper.selectResultScoresByDetailIdAndOrderByStaffIds(id, scoreDtos);
 	}
 
+	@Override
+	public int deleteResultScoreByDetailId(Long id){
+		return resultScoreMapper.deleteResultScoreByDetailId(id);
+	}
+
 
 
 }

src/main/java/com/lz/modules/sys/dao/app/ResultDetailMapper.java

@@ -46,4 +46,6 @@ public interface ResultDetailMapper extends BaseMapper<ResultDetail> {
     Long insertResultDetails(@Param("list") List<ResultDetail> resultDetails);
 
     List<ResultDetailDto> selectDtosByRecordId(@Param("recordResultId") Long id, @Param("modelId") Long modelId);
+
+    int deleteResultDetailByRecordId(@Param("recordId") Long recordId);
 }

src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java

@@ -70,4 +70,6 @@ public interface ResultDetailService extends IService<ResultDetail> {
     Long insertResultDetails(List<ResultDetail> resultDetails);
 
     List<ResultDetailDto> selectDtosByRecordId(Long id, Long modelId);
+
+    int deleteResultDetailByRecordId(Long recordId);
 }

src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java

@@ -128,5 +128,7 @@ public interface ResultRecordService extends IService<ResultRecord> {
 
     R getResetData(RecordDetailDto recordDetailDto);
 
-	R resetData(Long recordId,int clearFlag);
+
+	R resetData(Long recordId, int clearFlag);
+
 }

src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java

@@ -340,4 +340,9 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
 		return resultDetailMapper.selectDtosByRecordId(id, modelId);
 	}
 
+	@Override
+	public int deleteResultDetailByRecordId(Long recordId){
+		return resultDetailMapper.deleteResultDetailByRecordId(recordId);
+	}
+
 }

src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java

@@ -140,6 +140,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     @Value("${domain.main}")
     private String domain;
 
+    @Autowired
+    private ResultScoreService resultScoreService;
+
     @Override
     public ResultRecord selectResultRecordById(Long id) {
         return resultRecordMapper.selectResultRecordById(id);
@@ -1442,7 +1445,31 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     }
 
     @Override
-    public R resetData(Long recordId,int clearFlag) {
+    public R resetData(Long recordId, int clearFlag) {
-        return null;
+        List<ResultDetail> resultDetails = resultDetailService.selectByRecordId(recordId);
+
+        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("无数据删除");
+
     }
 }

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
     </select>
 
+    <update id="deleteResultDetailByRecordId" parameterType="java.lang.Long">
+        update lz_result_detail set is_delete = 1, gmt_modified = now() where record_id=#{recordId} and is_delete = 0
+    </update>
+
 </mapper>
 

src/main/resources/mapper/flow/ResultScoreMapper.xml

@@ -101,5 +101,9 @@
         )
     </select>
 
+    <update id="deleteResultScoreByDetailId" parameterType="java.lang.Long">
+        update lz_result_score set is_delete = 1, gmt_modified = now() where detail_id=#{id} and is_delete = 0
+    </update>
+
 </mapper>