From 83f839d5d64ba5b0bd7c9402bf418d9f3cc349cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Sat, 9 Oct 2021 18:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemController.java     |  5 +++
 .../com/jero/quartz/job/RemindersAllJob.java  | 32 +++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index e8578bec..d1bfaf7a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -5,6 +5,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
@@ -322,6 +324,9 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 			 sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode());
 			 sendMessageDTO.setTemplateParam(map);
 			 sendMessageDTO.setBusType("C_OPEN_TYPE11");
+			 JSONObject json = new JSONObject();
+			 json.put("id",p.getId());
+			 sendMessageDTO.setBusId(json.toJSONString());
 			 sendMessageService.SendMessageService(sendMessageDTO);
 		 });
 		 return Result.OK("添加成功！");
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/RemindersAllJob.java b/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/RemindersAllJob.java
index c81906b9..b370fee6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/RemindersAllJob.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/RemindersAllJob.java
@@ -1,5 +1,6 @@
 package com.jero.quartz.job;
 
+import com.alibaba.fastjson.JSONObject;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
@@ -38,20 +39,23 @@ public class RemindersAllJob implements Job {
             list.forEach(p->{
                 log.info(p.getChargeProject() + "=============发送消息");
                 // 发送消息
-//                SendMessageDTO sendMessageDTO = new SendMessageDTO();
-//                if(!StringUtils.isBlank(p.getEmail())){
-//                    sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
-//                }
-//                if(!StringUtils.isBlank(p.getPhone())){
-//                    sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
-//                    sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
-//                }
-//                HashMap<String,String> map = new HashMap<>();
-//                map.put("projectName",p.getChargeProject());
-//                sendMessageDTO.setFromUser(ProjectCommon.ADMIN);
-//                sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode());
-//                sendMessageDTO.setTemplateParam(map);
-//                sendMessageService.SendMessageService(sendMessageDTO);
+                SendMessageDTO sendMessageDTO = new SendMessageDTO();
+                if(!StringUtils.isBlank(p.getEmail())){
+                    sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
+                }
+                if(!StringUtils.isBlank(p.getPhone())){
+                    sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
+                    sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
+                }
+                HashMap<String,String> map = new HashMap<>();
+                map.put("projectName",p.getChargeProject());
+                sendMessageDTO.setFromUser(ProjectCommon.ADMIN);
+                sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode());
+                sendMessageDTO.setTemplateParam(map);
+                JSONObject json = new JSONObject();
+                json.put("id",p.getId());
+                sendMessageDTO.setBusId(json.toJSONString());
+                sendMessageService.SendMessageService(sendMessageDTO);
             });
         }
     }