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/BaseDictOperationController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
index 0d93202..43e80cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import io.swagger.annotations.Api;
@@ -46,7 +47,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞瓙鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:operation:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody BaseDictOperation baseDictOperation) {
startPage();
LoginUser loginUser = getLoginUser();
@@ -85,7 +87,8 @@
@ApiOperation("鏂板鎮ｈ�呮鏌ユ楠岃褰曞瓙")
//@PreAuthorize("@ss.hasPermi('smartor:operation:add')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody BaseDictOperation baseDictOperation) {
return toAjax(baseDictOperationService.insertBaseDictOperation(baseDictOperation));
}
@@ -96,7 +99,8 @@
@ApiOperation("淇敼鎮ｈ�呮鏌ユ楠岃褰曞瓙")
//@PreAuthorize("@ss.hasPermi('smartor:operation:edit')")
@Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseDictOperation baseDictOperation) {
return toAjax(baseDictOperationService.updateBaseDictOperation(baseDictOperation));
}
--
Gitblit v1.9.3