From def6370aced1ecf855c94b02afe03a9151f74309 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 26 Aug 2020 11:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E6=8A=BD?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResultRecordController.java    | 36 ++++++++++---------
 .../app/impl/ResultRecordServiceImpl.java     |  6 ++--
 2 files changed, 22 insertions(+), 20 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 be4cc88a..6e4056f4 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -319,8 +319,7 @@ public class ResultRecordController extends AbstractController {
                 r = R.ok("成功")
                         .put("from", mySelf)
                         .put("to", mySelf)
-                        .put("type", WorkMsgTypeEnum.REJECT)
-                        .put("count", 1);
+                        .put("type", WorkMsgTypeEnum.REJECT);
             }
         }
         resultCommentService.addOrUpdateComment(req, getUserId(), status);
@@ -330,20 +329,7 @@ public class ResultRecordController extends AbstractController {
                 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);
+                sendWorkMSG(mySelf, toSelf, workMsgTypeEnum, req.getRecordResultId(), 1);
                 return R.ok("成功");
             }
             return r;
@@ -354,6 +340,24 @@ public class ResultRecordController extends AbstractController {
         //return r != null ? r : R.ok("成功");
     }
 
+    private void sendWorkMSG(StaffEntity mySelf, StaffEntity toSelf, WorkMsgTypeEnum workMsgTypeEnum
+            , Long recordResultId, int count){
+        String url = domain + "/management/dingtalklogin?url=";//免登接口
+        String jump;
+        if(count == 1){//一个提交
+            logger.info("单个提交推送消息");
+            jump = domain + "/management/recorddetail?id=" + recordResultId
+                    + "&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);
+    }
+
     /**
      * 信息
      */
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 b42e5e85..fcae2125 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
@@ -374,8 +374,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             return R.ok("流程审批结束")
                     .put("from", staff)
                     .put("to", staff)
-                    .put("type", WorkMsgTypeEnum.PASS)
-                    .put("count", 1);
+                    .put("type", WorkMsgTypeEnum.PASS);
         }
 
         FlowRecord flowRecord = new FlowRecord();
@@ -434,8 +433,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         return R.ok("提交审批成功")
                 .put("from", staff)
                 .put("to", approvalStaff)
-                .put("type", WorkMsgTypeEnum.SUBMIT)
-                .put("count", staffRoleDtos.size());
+                .put("type", WorkMsgTypeEnum.SUBMIT);
     }
 
     @Override