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-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
index 2d65c2b..9a58888 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+import java.util.Map;
import com.ruoyi.common.annotation.AddOrgId;
import io.swagger.annotations.Api;
@@ -8,6 +9,7 @@
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -54,6 +56,18 @@
}
/**
+ * 鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃涓嶅垎椤�
+ */
+ @ApiOperation("鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃涓嶅垎椤�")
+ //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("listnopage")
+ public Map<String, Object> listnopage(@RequestBody ServiceTaskdiag serviceTaskdiag) {
+ List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
+ return getDataTable3(CollectionUtils.isEmpty(list) ? 0 : list.size(), list);
+ }
+
+ /**
* 瀵煎嚭妯℃澘绉戝鍏宠仈鍒楄〃
*/
@ApiOperation("瀵煎嚭妯℃澘绉戝鍏宠仈鍒楄〃")
--
Gitblit v1.9.3