From 2de561fb26478a638ed0bb3c8059b043eb2486e4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 10 Dec 2024 09:19:36 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/service/EmisBaseService.java    | 11 ++++++-----
 .../impl/EmisWaybillAjustApplyServiceImpl.java      | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index c89f15128..04735d7df 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -2334,17 +2334,18 @@ public class EmisBaseService {
 
      /**
       * 发送消息给用户
-      * @param empCode
+      * @param empCode,多个使用逗号隔开
       * @param title
       * @param msg
       * @param clickPath
       */
      public void sendNoticeToEmpUser(String empCode,String title,String msg,String clickPath){
-         Long userId=null;
          if(!StringUtils.isEmpty(empCode)){
-             SysUser empUser=getEmisStaffByCode(empCode);
-             userId=empUser.getUserId();
-             sysNoticeService.addNoticeToUser(title,msg,clickPath,userId);
+             String [] empCodeArr=empCode.split(",");
+             for(int i=0;i<empCodeArr.length;i++) {
+                 SysUser empUser = getEmisStaffByCode(empCode);
+                 sysNoticeService.addNoticeToUser(title, msg, clickPath, empUser.getUserId());
+             }
          }
      }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
index cc916fab9..55480c1ab 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
@@ -93,7 +93,12 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
     @Override
     public int insertEmisWaybillAjustApply(EmisWaybillAjustApply emisWaybillAjustApply)
     {
-        return emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply);
+        emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply);
+
+        String title="费用调整审核,请及时审批，单号【"+emisWaybillAjustApply.getBillCode()+"】";
+        sendNoticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083", title, "", "d24/orderManagement/UserOrderList");
+
+        return 1;
     }
 
     /**
@@ -240,6 +245,9 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
 //            sysNoticeService.addNoticeToUser(title,title,"d24/orderManagement/UserOrderList",userId);
 //        }
 
+        String title="费用调整已审批通过，单号【"+emisWaybillAjustApply.getBillCode()+"】";
+        sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "d24/orderManagement/UserOrderList");
+
         // 审核通过
         return emisWaybillAjustApplyMapper.auditCenterPass(emisWaybillAjustApply);
 
@@ -261,6 +269,9 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
         emisWaybillAjustApply.setCenterConfirmNote(inputObj.getCenterConfirmNote());
         emisWaybillAjustApply.setCenterConfirmManCode(getCurrentUser().getEmpCode());
 
+        String title="费用调整审批拒绝，单号【"+emisWaybillAjustApply.getBillCode()+"】";
+        sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "d24/orderManagement/UserOrderList");
+
         return emisWaybillAjustApplyMapper.auditCenterNoPass(emisWaybillAjustApply);
     }