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/HeLibraryTagController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java
index 0bb863b..563a3a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryTagController.java
@@ -18,6 +18,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
@@ -41,6 +42,7 @@
* 鏌ヨ鎸囨爣鏍囩鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:tag:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@GetMapping("/list")
public TableDataInfo list(HeLibraryTag heLibraryTag) {
startPage();
@@ -75,9 +77,8 @@
//@PreAuthorize("@ss.hasPermi('system:tag:add')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.INSERT)
@PostMapping
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult add(@RequestBody HeLibraryTag heLibraryTag) {
- SysUser user = getLoginUser().getUser();
- heLibraryTag.setOrgid(user.getOrgid());
return toAjax(heLibraryTagService.insertHeLibraryTag(heLibraryTag));
}
@@ -86,7 +87,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:edit')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
public AjaxResult edit(@RequestBody HeLibraryTag heLibraryTag) {
return toAjax(heLibraryTagService.updateHeLibraryTag(heLibraryTag));
}
@@ -96,7 +98,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:tag:remove')")
@Log(title = "鎸囨爣鏍囩", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(heLibraryTagService.deleteHeLibraryTagByIds(ids));
}
--
Gitblit v1.9.3