From fab5cfa770fcee202f9aa611e462e1de63663d74 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 26 五月 2026 09:29:45 +0800
Subject: [PATCH] 【丽水】超链接影响查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 9 ++++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 46 ++++-------------------
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java | 18 +++++++++
smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java | 2 +
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 12 ++++++
5 files changed, 49 insertions(+), 38 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 78df8b0..8d3c13c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -613,6 +613,15 @@
return success(serviceSubtaskService.getSfStatisticsJoydetails(serviceSubtaskCountReq));
}
+ /**
+ * 鑾峰彇闅忚缁熻姣斾緥
+ */
+ @ApiOperation("鑾峰彇闅忚缁熻瓒呴摼鎺�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/getSfStatisticsHyperlink")
+ public AjaxResult getSfStatisticsHyperlink(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ return success(serviceSubtaskService.getSfStatisticsHyperlink(serviceSubtaskCountReq));
+ }
/**
* 寤剁画鎶ょ悊缁熻
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index 3ffd606..9e6fd05 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -141,6 +141,24 @@
private List<String> groupKeyList;
/**
+ * 鍙戦�佺姸鎬� - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
+ private List<Long> sendstates;
+
+ /**
+ * 寮傚父鏍囪瘑 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "寮傚父鏍囪瘑锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
+ private String excep;
+
+ /**
+ * 褰撳墠鍙戦�佹柟寮� - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty("褰撳墠鍙戦�佹柟寮�")
+ private String currentPreachform;
+
+ /**
* pageNum
*/
@ApiModelProperty("pageNum")
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index e2a02ff..2c91991 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -151,6 +151,8 @@
public List<ServiceSubtaskCount> getSfStatisticsJoydetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
+ public List<ServiceSubtask> getSfStatisticsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
public List<ServiceStatisticsResponse> getServiceStatistics(ServiceStatisticsRequest request);
public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq);
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index a6a8563..007e5af 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -3746,43 +3746,6 @@
}
}
}
-
-// //璁板綍鏃犻渶闅忚璇︽儏
-// serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
-// //璁板綍闇�闅忚璇︽儏
-// serviceSubtaskStatistic.setFollowUpNeededAllInfo(followUpNeededAllInfo);
-// //璁板綍棣栨搴旈殢璁胯鎯�
-// serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
-// //璁板綍棣栨寰呴殢璁胯鎯�
-// serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
-// //璁板綍棣栨闅忚鎴愬姛璇︽儏
-// serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
-// //璁板綍棣栨闅忚澶辫触璇︽儏
-// serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
-// //璁板綍棣栨闅忚浜哄伐璇︽儏
-// serviceSubtaskStatistic.setManualInfo(manualInfo);
-// //璁板綍棣栨闅忚璇煶璇︽儏
-// serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
-// //璁板綍棣栨闅忚鐭俊璇︽儏
-// serviceSubtaskStatistic.setSmsInfo(smsInfo);
-// //璁板綍棣栨闅忚寰俊璇︽儏
-// serviceSubtaskStatistic.setWechatInfo(wechatInfo);
-// //璁板綍鍐嶆搴旈殢璁胯鎯�
-// serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
-// //璁板綍鍐嶆寰呴殢璁胯鎯�
-// serviceSubtaskStatistic.setPendingFollowUpAgainInfo(pendingFollowUpAgainInfo);
-// //璁板綍鍐嶆闅忚鎴愬姛璇︽儏
-// serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(followUpSuccessAgainInfo);
-// //璁板綍鍐嶆闅忚澶辫触璇︽儏
-// serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
-// //璁板綍鍐嶆闅忚浜哄伐璇︽儏
-// serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
-// //璁板綍鍐嶆闅忚璇煶璇︽儏
-// serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
-// //璁板綍鍐嶆闅忚鐭俊璇︽儏
-// serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
-// //璁板綍鍐嶆闅忚寰俊璇︽儏
-// serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);
return serviceSubtaskStatistic;
}
@@ -3945,6 +3908,13 @@
return serviceSubtaskMapper.getSfStatisticsJoydetails(serviceSubtaskCountReq);
}
+ @Override
+ public List<ServiceSubtask> getSfStatisticsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ List<ServiceSubtask> subtasks = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+ return subtasks;
+ }
+
+
/**
* 鑾峰彇闅忚缁熻姣斾緥
*
@@ -3952,7 +3922,7 @@
* @return
*/
@Override
-// @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+ @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 4eb5221..8735e9e 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1484,6 +1484,18 @@
#{key}
</foreach>
</if>
+ <if test="sendstates != null and sendstates.size() > 0">
+ AND sendstate IN
+ <foreach collection="sendstates" item="state" open="(" separator="," close=")">
+ #{state}
+ </foreach>
+ </if>
+ <if test="currentPreachform != null">
+ AND current_preachform = #{currentPreachform}
+ </if>
+ <if test="excep != null and excep != ''">
+ AND excep = #{excep}
+ </if>
</select>
<select id="getSfStatisticsGroupKey" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
resultType="String">
--
Gitblit v1.9.3