From 14c05113b72698a331259ce7c34c7ae8dd69ffd7 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 09 一月 2026 14:34:03 +0800
Subject: [PATCH] 【市一】问题统计接口调整
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java | 2 +-
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 11 +++++++----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
index f52c70e..b6a6aaf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
@@ -109,7 +109,7 @@
* 闂缁熻
*/
@ApiOperation("闂缁熻")
- @AddOrgId
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping(value = "/countPatByScript")
public AjaxResult countPatByScript(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
return success(svyLibTemplateScriptService.countPatByScript(serviceSubtaskCountReq));
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index a573f16..99eace4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -3068,6 +3068,7 @@
&& count.getSubtaskType().equals("2")){
SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = new SvyTaskTemplateScriptVO();
svyTaskTemplateScriptVO.setId(count.getScriptid());
+ svyTaskTemplateScriptVO.setOrgid(serviceSubtaskCountReq.getOrgid());
SvyTaskTemplateScriptVO svyTaskTemplateScriptResultVo = svyTaskTemplateScriptService.selectInfoByCondition(svyTaskTemplateScriptVO);
if(ObjectUtils.isNotEmpty(svyTaskTemplateScriptResultVo)){
List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptResultVo.getSvyTaskTemplateTargetoptions();
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index ea1985a..86fe53d 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1452,12 +1452,15 @@
<if test="configValue != null and configValue != ''">
AND ssd.categoryid IN (${configValue})
</if>
- <!-- 閫傜敤鍗曟潯鏌ヨ -->
- <if test="scriptids != null">
- AND ssd.scriptid in (${scriptids})
- </if>
group by ssd.scriptid) b
ON a.id = b.scriptid
+ <!-- 閫傜敤鍗曟潯鏌ヨ -->
+ <if test="scriptids != null">
+ AND a.scriptid in
+ (SELECT lib_script.scriptid FROM
+ svy_lib_template_script lib_script
+ WHERE lib_script.scriptid in (${scriptids}))
+ </if>
</select>
<select id="getSfStatisticsScriptItemDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
--
Gitblit v1.9.3