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/SvyLibTemplateController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
index e61dfc3..d833be2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
@@ -3,6 +3,7 @@
import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
import com.aliyun.teaopenapi.models.Config;
import com.github.pagehelper.ISelect;
+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;
@@ -12,10 +13,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
-import com.smartor.domain.SvyLibScriptTag;
-import com.smartor.domain.SvyLibTemplate;
-import com.smartor.domain.SvyLibTemplateReq;
-import com.smartor.domain.SvyLibTemplateVO;
+import com.smartor.domain.*;
import com.smartor.service.ISvyLibTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,6 +24,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* 闂嵎妯℃澘Controller
@@ -48,6 +47,21 @@
svyLibTemplate.setOrgid(user.getOrgid());
List<SvyLibTemplate> sviLibTemplate = svyLibTemplateService.getSviLibTemplate(svyLibTemplate);
return getDataTable(sviLibTemplate);
+ }
+
+ @ApiOperation("鏌ヨ闂嵎鍒楄〃閫氳繃閮ㄩ棬鐥呭尯浠ｇ爜")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/getSviLibTemplateByDeptCode")
+ public Map<String, Object> getSviLibTemplateByDeptCode(@RequestBody TemplateDeptVO templateDeptVO) {
+ templateDeptVO.setPageNum(PageUtils.getOffset(templateDeptVO.getPageNum(), templateDeptVO.getPageSize()));
+ List<SvyLibTemplate> sviLibTemplate = svyLibTemplateService.getSviLibTemplateByDeptCode(templateDeptVO);
+
+ //鑾峰彇total
+ templateDeptVO.setPageNum(null);
+ templateDeptVO.setPageSize(null);
+ List<SvyLibTemplate> total = svyLibTemplateService.getSviLibTemplateByDeptCode(templateDeptVO);
+
+ return getDataTable3(CollectionUtils.isNotEmpty(total) ? total.size() : 0L, sviLibTemplate);
}
/**
@@ -119,6 +133,7 @@
@ApiOperation("淇敼闂嵎")
//@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:edit')")
@Log(title = "闂嵎", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplate svyLibTemplate) {
return toAjax(svyLibTemplateService.updateSvyLibTemplate(svyLibTemplate));
--
Gitblit v1.9.3