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/ServiceOutPathController.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
index 037bb28..1065ee7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
@@ -7,17 +7,24 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.BaseOrganization;
+import com.smartor.domain.PatArchive;
import com.smartor.domain.ServiceOutPath;
+import com.smartor.domain.ServiceTask;
import com.smartor.service.IBaseOrganizationService;
+import com.smartor.service.IPatArchiveService;
import com.smartor.service.IServiceOutPathService;
+import com.smartor.service.IServiceTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -36,7 +43,19 @@
private IServiceOutPathService serviceOutPathService;
@Autowired
+ private IServiceTaskService serviceTaskService;
+
+ @Autowired
+ IPatArchiveService patArchiveService;
+
+ @Autowired
private IBaseOrganizationService baseOrganizationService;
+
+ @Autowired
+ private RSAPublicKeyExample rsaPublicKeyExample;
+
+ @Value("${pri_key}")
+ private String pri_key;
/**
* 鏌ヨ涓婚敭鍒楄〃
@@ -66,14 +85,25 @@
serviceOutPath1.setId(null);
serviceOutPath1.setRadix(null);
if(StringUtils.isNotEmpty(serviceOutPath1.getOrgid())){
+ String orgId = serviceOutPath1.getOrgid();
BaseOrganization baseOrganization = new BaseOrganization();
- baseOrganization.setOrgid(serviceOutPath1.getOrgid());
+ baseOrganization.setOrgid(orgId);
List<BaseOrganization> orgs = baseOrganizationService.selectBaseOrganizationList(baseOrganization);
if(CollectionUtils.isNotEmpty(orgs)){
String orgname = orgs.get(0).getOrganizationName();
+ serviceOutPath1.setOrgid(orgId);
serviceOutPath1.setOrgname(orgname);
}
}
+ if(StringUtils.isNotEmpty(serviceOutPath1.getParam2())){
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ Long patId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceOutPath1.getParam2(), pri_key));
+ if(patId != null){
+ PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(patId);
+ serviceOutPath1.setPatArchive(patArchive);
+ }
+ }
+
return success(serviceOutPath1);
}
return success(null);
@@ -112,6 +142,17 @@
return toAjax(serviceOutPathService.insertServiceOutPath(serviceOutPath));
}
+
+ /**
+ * 鏂板涓婚敭
+ */
+ @ApiOperation("鏂板涓婚敭")
+ @Log(title = "涓婚敭", businessType = BusinessType.INSERT)
+ @PostMapping("/addOutPath")
+ public AjaxResult addOutPath(@RequestBody ServiceOutPath serviceOutPath) {
+ return success(serviceOutPathService.addOutPath(serviceOutPath));
+ }
+
/**
* 淇敼涓婚敭
*/
--
Gitblit v1.9.3