diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 197e525d..b39f0150 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -961,16 +961,11 @@ public class ResultRecordController extends AbstractController { } } - //下面不限权重的,计算权重之和是否超标 - /*if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0 - && weight.compareTo(model.getWeight()) == 1){ - return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%"); - }*/ } //下面更新指标记录 - /*if(inserts.size() > 0){ + if(inserts.size() > 0){ resultDetailService.saveBatch(inserts); - }*/ + } if(updates.size() > 0){ resultDetailService.updateBatchById(updates); } @@ -994,14 +989,14 @@ public class ResultRecordController extends AbstractController { editResultDetails = mapDetails.values().stream().collect(Collectors.toList()); if(!isSetKeyResult){ log.info("实际需要写入评论的内容条数{}", updateResultDetails.size()); - if(updateResultDetails.size() > 0){ + if(editResultDetails.size() > 0){ updates.addAll(inserts); mapDetails = updates.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); String commandValue = ""; int commandIndex = 1; - for (ResultDetail resultDetail1:updateResultDetails + for (ResultDetail resultDetail1:editResultDetails ) { log.info("修改的对象为{}", resultDetail1); if(resultDetail1.getIsDelete().intValue() == 1){ diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index bff1d7fe..07ea71f3 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -760,7 +760,7 @@ public class DingtalkBusiness { info.setEmployeeId(userIds); logger.info("推送的人员信息{}", info); dingTalkUtil.sendSingleActionCardMSG(appid, info, WorkMsgTypeEnum.TASK_REPLY_COMMENT.getTitle(), - WorkMsgTypeEnum.TASK_REPLY_COMMENT.getContent(), WorkMsgTypeEnum.TASK_REPLY_COMMENT.getBtnText(), url, token); + content, WorkMsgTypeEnum.TASK_REPLY_COMMENT.getBtnText(), url, token); m = 0; userIds = ""; continue;