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-07 15:32:19 +08:00
parent 3717d59286
commit c49306c2a1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -777,7 +777,7 @@ public class ResultRecordController extends AbstractController {
ResultDetail resultDetail = new ResultDetail(); ResultDetail resultDetail = new ResultDetail();
BeanUtils.copyProperties(detailDto, resultDetail); BeanUtils.copyProperties(detailDto, resultDetail);
if(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);
@ -901,29 +901,33 @@ public class ResultRecordController extends AbstractController {
if(resultDetail != null){ if(resultDetail != null){
log.info("修改后的对象为{}", resultDetail1); log.info("修改后的对象为{}", resultDetail1);
boolean isUp = false; boolean isUp = false;
String value = "";
String heard = "";
if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
//打上标识 //打上标识
commandValue += ("(修改) 名称：" + value += ("(修改) 名称：" +
resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n"); resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n");
isUp = true; isUp = true;
}else{
heard = resultDetail1.getTarget() + "：\r\n";
} }
if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
//打上标识 //打上标识
commandValue += ("(修改) 考核标准：" + value += ("(修改) 考核标准：" +
resultDetail1.getKeyResult() + " 为：" + resultDetail.getTarget() + "\r\n"); resultDetail1.getKeyResult() + " 为：" + resultDetail.getTarget() + "\r\n");
isUp = true; isUp = true;
} }
if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
//打上标识 //打上标识
commandValue += ("(修改) 权重：" + value += ("(修改) 权重：" +
resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为：" resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为："
+ resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() +
"%\r\n"); "%\r\n");
isUp = true; isUp = true;
} }
if(isUp){ if(isUp){
commandValue = commandValue + "：" + commandValue; commandValue += (commandIndex + "：" + heard + value);
commandIndex++; commandIndex++;
resultDetail1.setIsBack(1); resultDetail1.setIsBack(1);
} }