From 32fa03401e062892468bf5340b149633614bfe52 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 21 Jun 2024 15:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../labelfieldinfo/LabelFieldInfoMapper.java  | 10 +++++++-
 .../TaskPartitionDictMapper.java              |  8 ------
 .../impl/LabelFieldContentServiceImpl.java    | 25 +++++++++++--------
 .../labelfieldinfo/LabelFieldInfoMapper.xml   | 13 ++++++++++
 .../TaskPartitionDictMapper.xml               | 12 ---------
 5 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java
index 641bd40b..697df589 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java
@@ -35,7 +35,7 @@ public interface LabelFieldInfoMapper {
      * @param fieldType 标签字段信息
      * @return 标签字段信息集合
      */
-     List<LabelFieldVO> selectLabelFieldList(String  fieldType);
+    List<LabelFieldVO> selectLabelFieldList(String fieldType);
 
     /**
      * 新增标签字段信息
@@ -78,4 +78,12 @@ public interface LabelFieldInfoMapper {
      * 检查除当前记录外有没有同名的字段信息名称
      */
     int countByFieldNameExcludingId(@Param("id") Long id, @Param("fieldType") String fieldType, @Param("fieldName") String fieldName);
+
+    /**
+     * 分组信息
+     *
+     * @param taskPartitionDictName 分组名
+     * @return LabelFieldInfo
+     */
+    List<LabelFieldInfo> taskPartitionDictIdList(String taskPartitionDictName);
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java
index e2cefa62..0d69a532 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java
@@ -60,12 +60,4 @@ public interface TaskPartitionDictMapper {
      * @return 结果
      */
     int deleteTaskPartitionDictByIds(Long[] ids);
-
-    /**
-     * 分组信息
-     *
-     * @param taskPartitionDictName 分组名
-     * @return LabelFieldInfo
-     */
-    List<LabelFieldInfo> taskPartitionDictIdList(String taskPartitionDictName);
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java
index 8c5cd3b6..62503514 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java
@@ -9,10 +9,11 @@ import com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo;
 import com.xinelu.manage.dto.labelfieldcontent.LabelFieldContentAddDTO;
 import com.xinelu.manage.dto.labelfieldcontent.LabelFieldContentDTO;
 import com.xinelu.manage.mapper.labelfieldcontent.LabelFieldContentMapper;
-import com.xinelu.manage.mapper.taskpartitiondict.TaskPartitionDictMapper;
+import com.xinelu.manage.mapper.labelfieldinfo.LabelFieldInfoMapper;
 import com.xinelu.manage.service.labelfieldcontent.ILabelFieldContentService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -33,7 +34,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
     @Resource
     private LabelFieldContentMapper labelFieldContentMapper;
     @Resource
-    private TaskPartitionDictMapper taskPartitionDictMapper;
+    private LabelFieldInfoMapper labelFieldInfoMapper;
 
     /**
      * 查询标签字段内容信息
@@ -149,17 +150,21 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
     @Override
     public AjaxResult groupingContent(String taskPartitionDictName) {
         ArrayList<LabelFieldInfo> labelFieldInfos = new ArrayList<>();
-        LabelFieldInfo labelFieldOne = new LabelFieldInfo();
-        labelFieldOne.setTaskPartitionDictId(0L);
-        labelFieldOne.setTaskPartitionDictName("全部");
-        labelFieldInfos.add(labelFieldOne);
-        List<LabelFieldInfo> labelFieldInfoList = taskPartitionDictMapper.taskPartitionDictIdList(taskPartitionDictName);
+        if (StringUtils.isBlank(taskPartitionDictName)) {
+            LabelFieldInfo labelFieldOne = new LabelFieldInfo();
+            labelFieldOne.setTaskPartitionDictId(0L);
+            labelFieldOne.setTaskPartitionDictName("全部");
+            labelFieldInfos.add(labelFieldOne);
+        }
+        List<LabelFieldInfo> labelFieldInfoList = labelFieldInfoMapper.taskPartitionDictIdList(taskPartitionDictName);
         if (CollectionUtils.isNotEmpty(labelFieldInfoList)) {
             labelFieldInfos.addAll(labelFieldInfoList);
         }
-        LabelFieldInfo labelFieldInfo = new LabelFieldInfo();
-        labelFieldInfo.setTaskPartitionDictName("未分组");
-        labelFieldInfos.add(labelFieldInfo);
+        if (StringUtils.isBlank(taskPartitionDictName)) {
+            LabelFieldInfo labelFieldInfo = new LabelFieldInfo();
+            labelFieldInfo.setTaskPartitionDictName("未分组");
+            labelFieldInfos.add(labelFieldInfo);
+        }
         return AjaxResult.success(labelFieldInfos);
     }
 }
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
index c4ac71d7..09340315 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
@@ -213,4 +213,17 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="taskPartitionDictIdList" resultType="com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo">
+        select
+        field_code,
+        task_partition_dict_id,
+        task_partition_dict_name
+        from label_field_info
+        <where>
+            <if test="taskPartitionDictName != null  and taskPartitionDictName != ''">
+                task_partition_dict_name like concat('%', #{taskPartitionDictName}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml
index a576f402..3b2c76a9 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml
@@ -206,16 +206,4 @@
             #{id}
         </foreach>
     </delete>
-
-    <select id="taskPartitionDictIdList" resultType="com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo">
-        select
-        id taskPartitionDictId,
-        task_partition_name taskPartitionDictName
-        from task_partition_dict
-        <where>
-            <if test="taskPartitionDictName != null  and taskPartitionDictName != ''">
-                task_type_name like concat('%', #{taskPartitionDictName}, '%')
-            </if>
-        </where>
-    </select>
 </mapper>
\ No newline at end of file