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-08 10:52:49 +08:00
parent 974fac214b
commit 6a25ce407c
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -777,45 +777,45 @@ public class ResultRecordController extends AbstractController {
) {//排序 ) {//排序
ResultDetail resultDetail = new ResultDetail(); ResultDetail resultDetail = new ResultDetail();
BeanUtils.copyProperties(detailDto, resultDetail); BeanUtils.copyProperties(detailDto, resultDetail);
if(!isSetKeyResult){
if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了 if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了
resultDetail.setIsBack(2); resultDetail.setIsBack(2);
resultDetail.setBackId(resultDetail.getId()); resultDetail.setBackId(resultDetail.getId());
updateResultDetails.add(resultDetail); updateResultDetails.add(resultDetail);
}else if(resultDetail.getId() == null){ }else if(resultDetail.getId() == null){
resultDetail.setIsBack(3);//新增 resultDetail.setIsBack(3);//新增
}else { }else {
if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){ if(resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){
//这里判断是否有更新，或者删除 //这里判断是否有更新，或者删除
boolean isUp = false; boolean isUp = false;
ResultDetail resultDetail1 = null; ResultDetail resultDetail1 = null;
resultDetail1 = mapDetails.get(resultDetail.getId()); resultDetail1 = mapDetails.get(resultDetail.getId());
if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
//打上标识 //打上标识
isUp = true; isUp = true;
} }
if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
//打上标识 //打上标识
isUp = true; isUp = true;
} }
if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
//打上标识 //打上标识
isUp = true; isUp = true;
} }
if(isUp){ if(isUp){
resultDetail1.setId(null); resultDetail1.setId(null);
resultDetail1.setIsBack(2); resultDetail1.setIsBack(2);
resultDetail1.setBackId(resultDetail.getId()); resultDetail1.setBackId(resultDetail.getId());
inserts.add(resultDetail1); inserts.add(resultDetail1);
}
} }
} }
} }
resultDetail.setPriority(index); resultDetail.setPriority(index);
index++; index++;