From 2867cf7076a584a34e63174cec0a8b89cdd03e4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:42:55 +0800
Subject: [PATCH] Merge branch 'master' into smartor_ls_261103
---
ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
index ac3f09a..e4e6b90 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
@@ -854,26 +854,35 @@
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSfStatisticsCountDetailsHyperLink")
public AjaxResult getSfStatisticsCountDetailsHyperLink(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ Integer statisticaltype = serviceSubtaskCountReq.getStatisticaltype();
+ if (statisticaltype != null && statisticaltype != 1 && statisticaltype != 2 && statisticaltype != 3) {
+ return error("缁熻缁村害statisticaltype浠呮敮鎸侊細1-鎸夌梾鍖� 2-鎸夌瀹� 3-鎸塼askid");
+ }
+ if (serviceSubtaskCountReq.getScriptid() == null
+ && StringUtils.isEmpty(serviceSubtaskCountReq.getScriptContent())) {
+ return error("闂ID(scriptid)涓嶈兘涓虹┖");
+ }
+ if (serviceSubtaskCountReq.getOptionText() == null) {
+ return error("闂閫夐」(optionText)涓嶈兘涓虹┖");
+ }
+
LoginUser loginUser = getLoginUser();
String orgid = loginUser.getUser().getOrgid();
+ serviceSubtaskCountReq.setOrgid(orgid);
+
+ // 涓� getSfStatisticsCountDetails 淇濇寔鐩稿悓鐨勯厤缃瓫閫夊彛寰�
String configKey = serviceSubtaskCountReq.getConfigKey();
if (StringUtils.isNotEmpty(configKey)) {
String configValue = sysConfigService.selectConfigByKey(configKey, orgid);
serviceSubtaskCountReq.setConfigValue(configValue);
if (StringUtils.isEmpty(configValue)) {
- String logInfo = "getSfStatisticsCount-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
+ String logInfo = "getSfStatisticsCountDetailsHyperLink-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
log.error(logInfo);
return error(logInfo);
}
}
- String followUpCountStyle = sysConfigService.selectConfigByKey("followUpCountStyle", orgid);
- if (ObjectUtils.isNotEmpty(followUpCountStyle)) {
- serviceSubtaskCountReq.setFollowUpCountStyle(followUpCountStyle);
- } else {
- serviceSubtaskCountReq.setFollowUpCountStyle("1");
- }
- return success(serviceSubtaskService.getSfStatisticsHyperlink(serviceSubtaskCountReq));
+ return success(serviceSubtaskService.getSfStatisticsScriptDetailsHyperlink(serviceSubtaskCountReq));
}
/**
* 鍙戦�佺煭淇℃ā鏉�
--
Gitblit v1.9.3