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/TemplateDeptController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
index 7c1b164..ae78459 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -73,6 +74,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:dept:add')")
@ApiOperation("鏂板妯℃澘绉戝鍏宠仈")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody List<TemplateDept> templateDepts) {
SysUser user = getLoginUser().getUser();
@@ -85,6 +87,7 @@
@ApiOperation("淇敼妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:dept:edit')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody TemplateDept templateDept) {
return toAjax(templateDeptService.updateTemplateDept(templateDept));
@@ -98,7 +101,7 @@
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.DELETE)
@GetMapping("/remove/{id}")
public AjaxResult remove(@PathVariable("id") Long id) {
- log.error("鍒犻櫎鐨処D涓猴細{}",id);
+ log.info("鍒犻櫎鐨処D涓猴細{}",id);
return toAjax(templateDeptService.deleteTemplateDeptById(id));
}
}
--
Gitblit v1.9.3