From 76f8cc7c3a4793a48095c43911195a43f4f8ef06 Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Thu, 2 Apr 2026 10:01:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=9E=E6=BB=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E4=BB=BB=E5=8A=A1=E8=BE=BE=E6=88=90?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/TaskServiceImpl.java |  41 -----
 .../resources/mapper/SimulationTaskMapper.xml | 160 +++++++-----------
 2 files changed, 60 insertions(+), 141 deletions(-)

diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
index 36f5a1a0..c4fa2955 100644
--- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
@@ -4044,47 +4044,6 @@ public class TaskServiceImpl implements ITaskService {
 
     @Override
     public SdmResponse getTaskAchieveStatistics(TaskCompleteStatisticsReq req) {
-
-        // 处理 discipline 和 tag1-tag10 字段，支持逗号分隔的多个值
-        // 注意：tag6 用于过滤 discipline 列，所以将 tag6 和 discipline 合并到 disciplineList
-        List<String> disciplineList = new ArrayList<>();
-        if (StringUtils.isNotBlank(req.getDiscipline())) {
-            disciplineList.addAll(Arrays.asList(req.getDiscipline().split(",")));
-        }
-        if (StringUtils.isNotBlank(req.getTag6())) {
-            disciplineList.addAll(Arrays.asList(req.getTag6().split(",")));
-        }
-        if (!disciplineList.isEmpty()) {
-            req.setDisciplineList(disciplineList);
-        }
-        if (StringUtils.isNotBlank(req.getTag1())) {
-            req.setTag1List(Arrays.asList(req.getTag1().split(",")));
-        }
-        if (StringUtils.isNotBlank(req.getTag2())) {
-            req.setTag2List(Arrays.asList(req.getTag2().split(",")));
-        }
-        if (StringUtils.isNotBlank(req.getTag3())) {
-            req.setTag3List(Arrays.asList(req.getTag3().split(",")));
-        }
-        if (StringUtils.isNotBlank(req.getTag4())) {
-            req.setTag4List(Arrays.asList(req.getTag4().split(",")));
-        }
-        if (StringUtils.isNotBlank(req.getTag5())) {
-            req.setTag5List(Arrays.asList(req.getTag5().split(",")));
-        }
-        if (StringUtils.isNotBlank(req.getTag7())) {
-            req.setTag7List(Arrays.asList(req.getTag7().split(",")));
-        }
-        if (StringUtils.isNotBlank(req.getTag8())) {
-            req.setTag8List(Arrays.asList(req.getTag8().split(",")));
-        }
-        if (StringUtils.isNotBlank(req.getTag9())) {
-            req.setTag9List(Arrays.asList(req.getTag9().split(",")));
-        }
-        if (StringUtils.isNotBlank(req.getTag10())) {
-            req.setTag10List(Arrays.asList(req.getTag10().split(",")));
-        }
-
         // 所有任务达成状态
         Set<String> allAchieveStatus = new HashSet<>();
         Long userId = ThreadLocalContext.getUserId();
diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml
index 8f0b3a80..62f15b20 100644
--- a/project/src/main/resources/mapper/SimulationTaskMapper.xml
+++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml
@@ -695,65 +695,45 @@
             stm.user_id = #{userId}
             AND task.tenant_id = #{tenantId}
             AND task.exe_status is not null
-            <if test="req.tag1List != null and req.tag1List.size() > 0">
-                and task.tag1 in
-                <foreach collection="req.tag1List" item="tag1Item" open="(" separator="," close=")">
-                    #{tag1Item}
-                </foreach>
+            <if test="req.tag1 != null and req.tag1 !='' ">
+                <bind name="searchKey1" value="'%' + req.tag1 + '%'"/>
+                and task.tag1 like #{searchKey1}
             </if>
-            <if test="req.tag2List != null and req.tag2List.size() > 0">
-                and task.tag2 in
-                <foreach collection="req.tag2List" item="tag2Item" open="(" separator="," close=")">
-                    #{tag2Item}
-                </foreach>
+            <if test="req.tag2 != null and req.tag2 !='' ">
+                <bind name="searchKey2" value="'%' + req.tag2 + '%'"/>
+                and task.tag2 like #{searchKey2}
             </if>
-            <if test="req.tag3List != null and req.tag3List.size() > 0">
-                and task.tag3 in
-                <foreach collection="req.tag3List" item="tag3Item" open="(" separator="," close=")">
-                    #{tag3Item}
-                </foreach>
+            <if test="req.tag3 != null and req.tag3 !='' ">
+                <bind name="searchKey3" value="'%' + req.tag3 + '%'"/>
+                and task.tag3 like #{searchKey3}
             </if>
-            <if test="req.tag4List != null and req.tag4List.size() > 0">
-                and task.tag4 in
-                <foreach collection="req.tag4List" item="tag4Item" open="(" separator="," close=")">
-                    #{tag4Item}
-                </foreach>
+            <if test="req.tag4 != null and req.tag4 !='' ">
+                <bind name="searchKey4" value="'%' + req.tag4 + '%'"/>
+                and task.tag4 like #{searchKey4}
             </if>
-            <if test="req.tag5List != null and req.tag5List.size() > 0">
-                and task.tag5 in
-                <foreach collection="req.tag5List" item="tag5Item" open="(" separator="," close=")">
-                    #{tag5Item}
-                </foreach>
+            <if test="req.tag5 != null and req.tag5 !='' ">
+                <bind name="searchKey5" value="'%' + req.tag5 + '%'"/>
+                and task.tag5 like #{searchKey5}
             </if>
-            <if test="req.disciplineList != null and req.disciplineList.size() > 0">
-                and task.discipline in
-                <foreach collection="req.disciplineList" item="disciplineItem" open="(" separator="," close=")">
-                    #{disciplineItem}
-                </foreach>
+            <if test="req.tag6 != null and req.tag6 !='' ">
+                <bind name="searchKey6" value="'%' + req.tag6 + '%'"/>
+                and task.discipline like #{searchKey6}
             </if>
-            <if test="req.tag7List != null and req.tag7List.size() > 0">
-                and task.tag7 in
-                <foreach collection="req.tag7List" item="tag7Item" open="(" separator="," close=")">
-                    #{tag7Item}
-                </foreach>
+            <if test="req.tag7 != null and req.tag7 !='' ">
+                <bind name="searchKey7" value="'%' + req.tag7 + '%'"/>
+                and task.tag7 like #{searchKey7}
             </if>
-            <if test="req.tag8List != null and req.tag8List.size() > 0">
-                and task.tag8 in
-                <foreach collection="req.tag8List" item="tag8Item" open="(" separator="," close=")">
-                    #{tag8Item}
-                </foreach>
+            <if test="req.tag8 != null and req.tag8 !='' ">
+                <bind name="searchKey8" value="'%' + req.tag8 + '%'"/>
+                and task.tag8 like #{searchKey8}
             </if>
-            <if test="req.tag9List != null and req.tag9List.size() > 0">
-                and task.tag9 in
-                <foreach collection="req.tag9List" item="tag9Item" open="(" separator="," close=")">
-                    #{tag9Item}
-                </foreach>
+            <if test="req.tag9 != null and req.tag9 !='' ">
+                <bind name="searchKey9" value="'%' + req.tag9 + '%'"/>
+                and task.tag9 like #{searchKey9}
             </if>
-            <if test="req.tag10List != null and req.tag10List.size() > 0">
-                and task.tag10 in
-                <foreach collection="req.tag10List" item="tag10Item" open="(" separator="," close=")">
-                    #{tag10Item}
-                </foreach>
+            <if test="req.tag10 != null and req.tag10 !='' ">
+                <bind name="searchKey10" value="'%' + req.tag10 + '%'"/>
+                and task.tag10 like #{searchKey10}
             </if>
         </where>
 
@@ -768,65 +748,45 @@
             snm.user_id = #{userId}
             AND task.tenant_id = #{tenantId}
             AND task.exe_status is not null
-            <if test="req.tag1List != null and req.tag1List.size() > 0">
-                and task.tag1 in
-                <foreach collection="req.tag1List" item="tag1Item" open="(" separator="," close=")">
-                    #{tag1Item}
-                </foreach>
+            <if test="req.tag1 != null and req.tag1 !='' ">
+                <bind name="searchKey1" value="'%' + req.tag1 + '%'"/>
+                and task.tag1 like #{searchKey1}
             </if>
-            <if test="req.tag2List != null and req.tag2List.size() > 0">
-                and task.tag2 in
-                <foreach collection="req.tag2List" item="tag2Item" open="(" separator="," close=")">
-                    #{tag2Item}
-                </foreach>
+            <if test="req.tag2 != null and req.tag2 !='' ">
+                <bind name="searchKey2" value="'%' + req.tag2 + '%'"/>
+                and task.tag2 like #{searchKey2}
             </if>
-            <if test="req.tag3List != null and req.tag3List.size() > 0">
-                and task.tag3 in
-                <foreach collection="req.tag3List" item="tag3Item" open="(" separator="," close=")">
-                    #{tag3Item}
-                </foreach>
+            <if test="req.tag3 != null and req.tag3 !='' ">
+                <bind name="searchKey3" value="'%' + req.tag3 + '%'"/>
+                and task.tag3 like #{searchKey3}
             </if>
-            <if test="req.tag4List != null and req.tag4List.size() > 0">
-                and task.tag4 in
-                <foreach collection="req.tag4List" item="tag4Item" open="(" separator="," close=")">
-                    #{tag4Item}
-                </foreach>
+            <if test="req.tag4 != null and req.tag4 !='' ">
+                <bind name="searchKey4" value="'%' + req.tag4 + '%'"/>
+                and task.tag4 like #{searchKey4}
             </if>
-            <if test="req.tag5List != null and req.tag5List.size() > 0">
-                and task.tag5 in
-                <foreach collection="req.tag5List" item="tag5Item" open="(" separator="," close=")">
-                    #{tag5Item}
-                </foreach>
+            <if test="req.tag5 != null and req.tag5 !='' ">
+                <bind name="searchKey5" value="'%' + req.tag5 + '%'"/>
+                and task.tag5 like #{searchKey5}
             </if>
-            <if test="req.disciplineList != null and req.disciplineList.size() > 0">
-                and task.discipline in
-                <foreach collection="req.disciplineList" item="disciplineItem" open="(" separator="," close=")">
-                    #{disciplineItem}
-                </foreach>
+            <if test="req.tag6 != null and req.tag6 !='' ">
+                <bind name="searchKey6" value="'%' + req.tag6 + '%'"/>
+                and task.discipline like #{searchKey6}
             </if>
-            <if test="req.tag7List != null and req.tag7List.size() > 0">
-                and task.tag7 in
-                <foreach collection="req.tag7List" item="tag7Item" open="(" separator="," close=")">
-                    #{tag7Item}
-                </foreach>
+            <if test="req.tag7 != null and req.tag7 !='' ">
+                <bind name="searchKey7" value="'%' + req.tag7 + '%'"/>
+                and task.tag7 like #{searchKey7}
             </if>
-            <if test="req.tag8List != null and req.tag8List.size() > 0">
-                and task.tag8 in
-                <foreach collection="req.tag8List" item="tag8Item" open="(" separator="," close=")">
-                    #{tag8Item}
-                </foreach>
+            <if test="req.tag8 != null and req.tag8 !='' ">
+                <bind name="searchKey8" value="'%' + req.tag8 + '%'"/>
+                and task.tag8 like #{searchKey8}
             </if>
-            <if test="req.tag9List != null and req.tag9List.size() > 0">
-                and task.tag9 in
-                <foreach collection="req.tag9List" item="tag9Item" open="(" separator="," close=")">
-                    #{tag9Item}
-                </foreach>
+            <if test="req.tag9 != null and req.tag9 !='' ">
+                <bind name="searchKey9" value="'%' + req.tag9 + '%'"/>
+                and task.tag9 like #{searchKey9}
             </if>
-            <if test="req.tag10List != null and req.tag10List.size() > 0">
-                and task.tag10 in
-                <foreach collection="req.tag10List" item="tag10Item" open="(" separator="," close=")">
-                    #{tag10Item}
-                </foreach>
+            <if test="req.tag10 != null and req.tag10 !='' ">
+                <bind name="searchKey10" value="'%' + req.tag10 + '%'"/>
+                and task.tag10 like #{searchKey10}
             </if>
         </where>
     </select>