From fb9c56894fcee50e17f47253728a4ef0f16a1e0a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 11 六月 2026 15:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 1 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java | 31 ++++++++++++++++++++++++++++++-
smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java | 1 -
smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailVO.java | 9 +++++++++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml | 7 +++++++
ruoyi-admin/src/main/resources/application.yml | 1 +
6 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
index 5daa549..86252e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
@@ -4,8 +4,10 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
import com.smartor.service.IServiceSubtaskDetailService;
@@ -17,6 +19,8 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+
+import static com.ruoyi.framework.datasource.DynamicDataSourceContextHolder.log;
/**
* 璇煶浠诲姟缁撴灉鏄庣粏Controller
@@ -32,6 +36,9 @@
private IServiceSubtaskDetailService ServiceSubtaskDetailService;
@Autowired
private IServiceSubtaskService serviceSubtaskService;
+
+ @Autowired
+ private ISysConfigService configService;
/**
* 鏌ヨ鍗曚釜浜虹殑璇煶淇℃伅
@@ -156,11 +163,33 @@
/**
* 鑾峰彇闅忚璇︽儏-鎸囨爣璇︽儏(瓒呴摼鎺�)
*/
- @ApiOperation("鑾峰彇闅忚璇︽儏-鎸囨爣璇︽儏(瓒呴摼鎺�)")
+ @ApiOperation("鑾峰彇闅忚璇︽儏-鎸囨爣璇︽儏")
@PostMapping("/getServiceSubtaskDetails")
public List<Map<String, Object>> getServiceSubtaskDetails(@RequestBody ServiceSubtaskDetailVO serviceSubtaskDetailVO) {
List<Map<String, Object>> map = new ArrayList<>();
map = ServiceSubtaskDetailService.getServiceSubtaskDetails(serviceSubtaskDetailVO);
return map;
}
+
+ /**
+ * 鑾峰彇闅忚璇︽儏-鎸囨爣璇︽儏(瓒呴摼鎺�)
+ */
+ @ApiOperation("鑾峰彇闅忚璇︽儏-鎸囨爣璇︽儏(瓒呴摼鎺�)")
+ @PostMapping("/getServiceSubtaskDetailsHyperlink")
+ public List<Map<String, Object>> getServiceSubtaskDetailsHyperlink(@RequestBody ServiceSubtaskDetailVO serviceSubtaskDetailVO) {
+ LoginUser loginUser = getLoginUser();
+ String orgid = loginUser.getUser().getOrgid();
+ String configKey = serviceSubtaskDetailVO.getConfigKey();
+ if (StringUtils.isNotEmpty(configKey)) {
+ String configValue = configService.selectConfigByKey(configKey, orgid);
+ serviceSubtaskDetailVO.setConfigValue(configValue);
+ if (StringUtils.isEmpty(configValue)) {
+ String logInfo = "getSfStatisticsCount-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
+ log.error(logInfo);
+ }
+ }
+ List<Map<String, Object>> map = new ArrayList<>();
+ map = ServiceSubtaskDetailService.getServiceSubtaskDetails(serviceSubtaskDetailVO);
+ return map;
+ }
}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b6d2613..c326222 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -69,6 +69,7 @@
# Spring閰嶇疆
spring:
+ datasource:
# 璧勬簮淇℃伅
messages:
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index 01a61db..8c814e2 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -922,7 +922,6 @@
oi.pguid,
oi.guid,
oi.pid,
- oi.opercheck_flag,
oi.long_task_reason,
oi.last_Update_Time
from HEALTHY_PAT_MED_OPERATION_ITEM oi
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailVO.java
index 12a5674..96026bd 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailVO.java
@@ -201,6 +201,15 @@
@ApiModelProperty("闂缁村害")
private String dimension;
+ @ApiModelProperty(value = "鏌ヨ鍙傛暟 joyCount-婊℃剰搴︾粺璁�; returnVisitCount-澶嶈瘖缁熻")
+ private String configKey;
+
+ @ApiModelProperty(value = "鏌ヨ鍙傛暟瀵瑰簲鍊� joyCount-婊℃剰搴︾粺璁�; returnVisitCount-澶嶈瘖缁熻")
+ private String configValue;
+
+ @ApiModelProperty(value = "鏄惁濉姤 0-鍏ㄩ儴 1-宸插～鎶�")
+ private String isFilled;
+
/**
* 鍑洪櫌鐥呭尯缂栧彿
*/
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java
index c917f84..0323b0d 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java
@@ -31,7 +31,6 @@
public Map<String, Object> selectServiceSubtaskDetailList(ServiceSubtaskDetail serviceSubtaskDetail);
public List<Map<String, Object>> getServiceSubtaskDetails(ServiceSubtaskDetailVO serviceSubtaskDetailVo);
-
/**
* 鏂板璇煶浠诲姟鍛煎彨鏄庣粏
*
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
index f661975..1718b54 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
@@ -240,6 +240,13 @@
#{scriptId}
</foreach>
</if>
+ <if test="isFilled != null and isFilled != '0'">
+ AND IFNULL(ssd.matchedtext,ssd.asrtext) is not null
+ AND IFNULL(ssd.matchedtext,ssd.asrtext) != ''
+ </if>
+ <if test="configValue != null and configValue != ''">
+ AND ssd.categoryid IN (${configValue})
+ </if>
order by ssd.sub_id desc, ssd.id desc
</select>
<select id="selectServiceSubtaskDetailByCalldetailid" parameterType="String" resultMap="ServiceSubtaskDetailResult">
--
Gitblit v1.9.3