From 71617a486cfc61d4c8a507a1b0ee19b53a2224b0 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:04:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9D=83=E9=87=8D=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=8F=8A=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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 c7a70ce1..3c9d1194 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -791,7 +791,7 @@ public class ResultRecordController extends AbstractController { ResultRecord resultRecord = new ResultRecord(); BeanUtils.copyProperties(dto, resultRecord); resultRecord.setAllScore(resultRecord.getLastScore()); - List inserts = new ArrayList<>(); + //List inserts = new ArrayList<>(); List updates = new ArrayList<>(); List insertScores = new ArrayList<>(); @@ -951,16 +951,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); } From c9735ec966a34467e6f6a173c762361ac93ab706 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:07:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3c9d1194..76658264 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -791,7 +791,7 @@ public class ResultRecordController extends AbstractController { ResultRecord resultRecord = new ResultRecord(); BeanUtils.copyProperties(dto, resultRecord); resultRecord.setAllScore(resultRecord.getLastScore()); - //List inserts = new ArrayList<>(); + List inserts = new ArrayList<>(); List updates = new ArrayList<>(); List insertScores = new ArrayList<>(); From b4d8a49e2f453c9555ea0baae5e0e58cf5bd39d6 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:14:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 76658264..1e8dcd88 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -979,14 +979,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){ From ac732bc9bd3dd11755dbe741731d7d4caf578e51 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:26:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=80=9A=E7=9F=A5@=E7=9A=84=E6=9B=BF=E6=8D=A2=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/job/business/DingtalkBusiness.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;