From 3f9d1b1fa7ded63c5e83116b1ab2300356ecfa09 Mon Sep 17 00:00:00 2001 From: zc Date: Tue, 1 Jul 2025 17:08:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E5=AE=89=E5=8F=AA=E5=8F=91=E9=80=81?= =?UTF-8?q?=E4=BC=81=E5=BE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VisCarryStuffController.java | 4 ++-- .../visitor/controller/VisitorController.java | 20 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java index 433c4c8..d12d6ee 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java @@ -132,8 +132,8 @@ public class VisCarryStuffController extends BaseController { String url = getExamineUrl(String.valueOf(vo.getId()), people.getPhone()); log.info("携物申请add发送审核链接：{}", url); //发送钉钉信息 - String content = getContent(vo); - visitorController.asyncsendV2(sysPeople.getPhone(), "text", content + url); +// String content = getContent(vo); +// visitorController.asyncsendV2(sysPeople.getPhone(), "text", content + url); //发送企微信息 try { diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java index aed300f..7a1330d 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java @@ -475,7 +475,7 @@ public class VisitorController extends BaseController { //发送企微信息 try { -// sendWeCom(sysPeople.getPhone(), url + " --访客姓名：" + visitor.getName()); + sendWeCom(sysPeople.getPhone(), url + " --访客姓名：" + visitor.getName()); } catch (Exception e) { log.error("访客add-sendWeCom异常：{}", e.getMessage()); } @@ -988,13 +988,20 @@ public class VisitorController extends BaseController { //查询随访人员信息 Visitor visitor2 = new Visitor(); visitor2.setParentId(visitor.getId()); - List itemList = visitorService.selectVisitorItemList(visitor2); - String content = getContent(visitor1, itemList); String url = getExamineUrl(String.valueOf(visitor.getId()), nextPeople.getPhone()); log.info("approve发送审核链接：{}", url); - String str = content + url; - asyncsendV2(nextPeople.getPhone(), "text", str); - log.info("发送钉钉结束:{}", nextPeople.getPhone()); +// List itemList = visitorService.selectVisitorItemList(visitor2); +// String content = getContent(visitor1, itemList); +// String str = content + url; +// asyncsendV2(nextPeople.getPhone(), "text", str); +// log.info("发送钉钉结束:{}", nextPeople.getPhone()); + + try { + sendWeCom(nextPeople.getPhone(), url + " --访客姓名：" + visitor.getName()); + } catch (Exception e) { + log.error("访客approve-sendWeCom异常：{}", e.getMessage()); + } + } else {//最后一级审核 visitor.setExamineState(examine.getExamine()); //保存审核历史表 @@ -1481,6 +1488,7 @@ public class VisitorController extends BaseController { map.put("code", code); SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class); SmsResult result = smsTemplate.send(phone, templateId, map); + log.info("sendMessage-phone：{}，result：{}", phone, result); if (!result.getIsSuccess()) { return error(result.getMessage()); }