From 65a3dc5e716e49ef7ee1223bf80f5da7ed18f460 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 26 Aug 2020 09:12:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=97=B6=E6=89=93=E5=BC=80=E4=B8=9A=E7=BB=A9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=88=97=E8=A1=A8=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ResultRecordController.java      | 13 ++++++++++---
 .../service/app/impl/ResultRecordServiceImpl.java   |  6 ++++--
 2 files changed, 14 insertions(+), 5 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 187858db..995c23a3 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -318,7 +318,8 @@ public class ResultRecordController extends AbstractController {
                 r = R.ok("成功")
                         .put("from", mySelf)
                         .put("to", mySelf)
-                        .put("type", WorkMsgTypeEnum.REJECT);
+                        .put("type", WorkMsgTypeEnum.REJECT)
+                        .put("count", 1);
             }
         }
         resultCommentService.addOrUpdateComment(req, getUserId(), status);
@@ -328,8 +329,14 @@ public class ResultRecordController extends AbstractController {
                 StaffEntity toSelf = (StaffEntity)r.get("to");
                 WorkMsgTypeEnum workMsgTypeEnum = (WorkMsgTypeEnum)r.get("type");
                 String url = domain + "/management/dingtalklogin?url=";//免登接口
-                String jump = domain + "/management/recorddetail?id=" + req.getRecordResultId()
-                        + "&recordType=3" ;//跳转接口
+                String jump;
+                if((int)r.get("count") == 1){//一个提交
+                    jump = domain + "/management/recorddetail?id=" + req.getRecordResultId()
+                            + "&recordType=3" ;//跳转接口
+                }else{//批量提交
+                    jump = domain + "/management/result-record-lzresultrecordapp";//跳转接口
+                }
+
                 jump = URLEncoder.encode(jump);
                 String msg = dingtalkBusiness.sendWorkMSGByEntity(appid, mySelf, toSelf, workMsgTypeEnum, url + jump);
             }
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 c061fed0..f74075db 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
@@ -359,7 +359,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             return R.ok("流程审批结束")
                     .put("from", staff)
                     .put("to", staff)
-                    .put("type", WorkMsgTypeEnum.PASS);
+                    .put("type", WorkMsgTypeEnum.PASS)
+                    .put("count", 1);
         }
 
         FlowRecord flowRecord = new FlowRecord();
@@ -411,7 +412,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         return R.ok("提交审批成功")
                 .put("from", staff)
                 .put("to", approvalStaff)
-                .put("type", WorkMsgTypeEnum.SUBMIT);
+                .put("type", WorkMsgTypeEnum.SUBMIT)
+                .put("count", staffRoleDtos.size());
     }
 
     @Override