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/HeLibraryAssortController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
index 8dc65c0..3f9b93c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryAssortController.java
@@ -1,14 +1,17 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.PageUtils;
import com.smartor.domain.HeLibraryAssort;
import com.smartor.domain.HeLibraryAssortVO;
import com.smartor.service.IHeLibraryAssortService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+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;
@@ -47,10 +50,9 @@
//@PreAuthorize("@ss.hasPermi('smartor:assort:list')")
@PostMapping("/selectHeLibraryAssortList")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
- public TableDataInfo list(@RequestBody HeLibraryAssort heLibraryAssort) {
- startPage();
+ public Map<String, Object> list(@RequestBody HeLibraryAssort heLibraryAssort) {
List<HeLibraryAssortVO> list = heLibraryAssortService.selectHeLibraryAssortList(heLibraryAssort);
- return getDataTable(list);
+ return getDataTable3(CollectionUtils.isNotEmpty(list) ? list.size() : 0, list);
}
/**
--
Gitblit v1.9.3