wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wulin 2020-12-03 14:27:55 +08:00
parent 923268ea97
commit 59550c4dfb
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1447,20 +1447,29 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
@Override @Override
public R resetData(Long recordId, int clearFlag) { public R resetData(Long recordId, int clearFlag) {
List<ResultDetail> resultDetails = resultDetailService.selectByRecordId(recordId); List<ResultDetail> resultDetails = resultDetailService.selectByRecordId(recordId);
log.info("需要删除指标个数{}", resultDetails.size());
if(clearFlag == 1){
log.info("全部清空，删除所有指标即可");
resultDetailService.deleteResultDetailByRecordId(recordId);
//return R.ok();
}
//删除指标以外的所有数据，评分、评分说明、结果
for(ResultDetail detail : resultDetails){ log.info("需要删除指标个数{}", resultDetails.size());
detail.setCheckResult(null); if(resultDetails.size() > 0){
detail.setAcquireScore(null); if(clearFlag == 1){
detail.setSuperScore(null); log.info("全部清空，删除所有指标即可");
resultScoreService.deleteResultScoreByDetailId(detail.getId()); 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("无数据删除");
} }
} }