From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index 7fd38e9..4f6a7b5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -84,7 +84,8 @@
public void sendVisitTemplateNotice(WxNoticeConfigMapper wxNoticeConfigMapper, Visits visits, String objCode, String token, List<String> openIds){
try{
if(CollectionUtils.isNotEmpty(openIds)){
- WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.visit)
+ WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda()
+ .in(WxNoticeConfig::getObjType,WxPlatConstants.visit,WxPlatConstants.visitReport)
.eq(WxNoticeConfig::getObjCode,objCode)
.eq(WxNoticeConfig::getStatus, Constants.ZERO)
.last(" limit 1")
@@ -102,14 +103,14 @@
Map<String, Object> thing1 = new HashMap<String,Object>();
thing1.put("value", visits.getName());
Map<String, Object> car_number7 = new HashMap<String,Object>();
- car_number7.put("value",StringUtils.isNotBlank(visits.getCarNos())?visits.getCarNos():"-");
+ car_number7.put("value",StringUtils.isNotBlank(visits.getCarNos())?visits.getCarNos():"鏃�");
+ dataMap.put("car_number7",car_number7);
Map<String, Object> character_string6 = new HashMap<String,Object>();
character_string6.put("value","1");
Map<String, Object> thing4 = new HashMap<String,Object>();
thing4.put("value",visits.getReason());
dataMap.put("const9",const9);
dataMap.put("thing1",thing1);
- dataMap.put("car_number7",car_number7);
dataMap.put("character_string6",character_string6);
dataMap.put("thing4",thing4);
paramMap.put("data", dataMap);
--
Gitblit v1.9.3