From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
index 8d30d85..7560190 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
@@ -10,7 +10,10 @@
*/
public enum WxGZHEnum {
ZYY("47231022633110211A2101", "3311000002", "MzMxMTAwMDAwMg==", "http://40.78.1.5:8101/frontend/medical/api"),
- JN("47255004333112711A1001", null, null, null);
+ JN("47255004333112711A1001", null, null, null),
+ HB("1", "3311000002", "MzMxMTAwMDAwMg==", "http://40.78.1.5:8101/frontend/medical/api"),
+ WS("2", "3311000002", "MzMxMTAwMDAwMg==", "http://40.78.1.5:8101/frontend/medical/api");
+
private String orgid;
@@ -31,10 +34,10 @@
for (int i = 0; i < organEnums.length; i++) {
WxGZHEnum organEnum = organEnums[i];
if (organEnum.getOrgid().equals(orgid)) {
- if (StringUtils.isEmpty(organEnum.getOrgid())) list.add(organEnum.getOrgid());
- if (StringUtils.isEmpty(organEnum.getAppid())) list.add(organEnum.getAppid());
- if (StringUtils.isEmpty(organEnum.getAppSecret())) list.add(organEnum.getAppSecret());
- if (StringUtils.isEmpty(organEnum.getAddress())) list.add(organEnum.getAddress());
+ if (StringUtils.isNotEmpty(organEnum.getOrgid())) list.add(organEnum.getOrgid());
+ if (StringUtils.isNotEmpty(organEnum.getAppid())) list.add(organEnum.getAppid());
+ if (StringUtils.isNotEmpty(organEnum.getAppSecret())) list.add(organEnum.getAppSecret());
+ if (StringUtils.isNotEmpty(organEnum.getAddress())) list.add(organEnum.getAddress());
}
}
return list;
--
Gitblit v1.9.3