From fcfa25fdebf9a828c3f493a30bf84dd74d430f6c Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 26 Aug 2020 10:33:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=97=B6=E4=B8=8D=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=A9=B3=E5=9B=9E=E7=9B=AE=E6=A0=87=E7=9A=84=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=8B=A6=E6=88=AA=E5=B9=B6=E6=8F=90=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=E6=97=B6=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=E7=9A=84=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ResultRecordController.java       | 12 +++++++++---
 .../service/app/impl/ResultRecordServiceImpl.java    |  2 +-
 2 files changed, 10 insertions(+), 4 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 0d3d1add..f9ef05ad 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -323,26 +323,32 @@ public class ResultRecordController extends AbstractController {
             }
         }
         resultCommentService.addOrUpdateComment(req, getUserId(), status);
-        try {
-            if(r != null && (int)r.get("code") == 0){//下面推送消息
+
+        if(r != null){//下面推送消息
+            if(r.isSuccess()){
                 StaffEntity mySelf = (StaffEntity)r.get("from");
                 StaffEntity toSelf = (StaffEntity)r.get("to");
                 WorkMsgTypeEnum workMsgTypeEnum = (WorkMsgTypeEnum)r.get("type");
                 String url = domain + "/management/dingtalklogin?url=";//免登接口
                 String jump;
                 if((int)r.get("count") == 1){//一个提交
+                    logger.info("单个提交推送消息");
                     jump = domain + "/management/recorddetail?id=" + req.getRecordResultId()
                             + "&recordType=3" ;//跳转接口
                 }else{//批量提交
+                    logger.info("批量提交推送消息");
                     jump = domain + "/management/result-record-lzresultrecordapp";//跳转接口
                 }
 
                 jump = URLEncoder.encode(jump);
                 String msg = dingtalkBusiness.sendWorkMSGByEntity(appid, mySelf, toSelf, workMsgTypeEnum, url + jump);
+                logger.info("发送钉钉工作消息{}", msg);
+                return R.ok("成功");
             }
-        } catch (Exception e) {
+            return r;
 
         }
+
         return R.ok("成功");
         //return r != null ? r : R.ok("成功");
     }
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 5633a0bd..9a87b771 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -324,7 +324,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         if (CollectionUtils.isEmpty(resultDetails)) {
             return R.error("请先添加业绩");
         }
-        double sum = resultDetails.stream().filter(p -> p.getType() == 1).mapToDouble(p -> NumberUtil.objToDoubleWithDefault(p.getCheckWeight(), 0d)).sum();
+        double sum = resultDetails.parallelStream().filter(p -> p.getType() == 1).mapToDouble(p -> NumberUtil.objToDoubleWithDefault(p.getCheckWeight(), 0d)).sum();
         if (sum < 0.7) {
             return R.error("recordId为[" + recordId + "]业绩权重之和必需大于0.7");
         }