From 772667d39d3bd2084380442eaec52cc376a5a285 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Thu, 15 Aug 2024 10:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=8F=8F=E8=BF=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysDictDataController.java     |  8 +++++
 .../op/system/mapper/SysDictDataMapper.java   |  2 ++
 .../system/service/ISysDictDataService.java   |  2 ++
 .../service/impl/SysDictDataServiceImpl.java  |  5 ++++
 .../mapper/system/SysDictDataMapper.xml       | 30 +++++++++++++++++++
 .../controller/BaseDictDataController.java    |  7 +----
 .../com/op/wms/mapper/BaseDictDataMapper.java |  2 +-
 .../op/wms/service/IBaseDictDataService.java  |  1 -
 .../service/impl/BaseDictDataServiceImpl.java |  5 +---
 .../mapper/wms/BaseDictDataMapper.xml         | 30 -------------------
 10 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/op-modules/op-system/src/main/java/com/op/system/controller/SysDictDataController.java b/op-modules/op-system/src/main/java/com/op/system/controller/SysDictDataController.java
index a180f4bf..a92f8a12 100644
--- a/op-modules/op-system/src/main/java/com/op/system/controller/SysDictDataController.java
+++ b/op-modules/op-system/src/main/java/com/op/system/controller/SysDictDataController.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -49,6 +50,13 @@ public class SysDictDataController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/getDictData")
+    @DS("#header.poolName")
+    public AjaxResult getDict(SysDictData dictData) {
+        List<SysDictData> list = dictDataService.getDictDataList(dictData);
+        return success(list);
+    }
+
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @RequiresPermissions("system:dict:export")
     @PostMapping("/export")
diff --git a/op-modules/op-system/src/main/java/com/op/system/mapper/SysDictDataMapper.java b/op-modules/op-system/src/main/java/com/op/system/mapper/SysDictDataMapper.java
index 2e25ff42..b929afdb 100644
--- a/op-modules/op-system/src/main/java/com/op/system/mapper/SysDictDataMapper.java
+++ b/op-modules/op-system/src/main/java/com/op/system/mapper/SysDictDataMapper.java
@@ -92,4 +92,6 @@ public interface SysDictDataMapper {
      * @return 结果
      */
     public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
+
+    List<SysDictData> getDictDataList(SysDictData dictData);
 }
diff --git a/op-modules/op-system/src/main/java/com/op/system/service/ISysDictDataService.java b/op-modules/op-system/src/main/java/com/op/system/service/ISysDictDataService.java
index c2b73bbb..33f95788 100644
--- a/op-modules/op-system/src/main/java/com/op/system/service/ISysDictDataService.java
+++ b/op-modules/op-system/src/main/java/com/op/system/service/ISysDictDataService.java
@@ -57,4 +57,6 @@ public interface ISysDictDataService {
      * @return 结果
      */
     public int updateDictData(SysDictData dictData);
+
+    List<SysDictData> getDictDataList(SysDictData dictData);
 }
diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDictDataServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDictDataServiceImpl.java
index 1d92362b..6b58066a 100644
--- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDictDataServiceImpl.java
+++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDictDataServiceImpl.java
@@ -99,4 +99,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
         }
         return row;
     }
+
+    @Override
+    public List<SysDictData> getDictDataList(SysDictData dictData) {
+        return dictDataMapper.getDictDataList(dictData);
+    }
 }
diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index 54f28117..eea8bfb4 100644
--- a/op-modules/op-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/op-modules/op-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -41,6 +41,36 @@
         order by dict_sort asc
     </select>
 
+    <select id="getDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
+        select
+        CONCAT(dict_label,'[',dict_value,']') AS dict_label,
+        dict_code,
+        dict_sort,
+        dict_value,
+        dict_type,
+        status,
+        remark
+        from base_dict_data
+        <where>
+            <if test="dictType != null and dictType != ''">
+                AND dict_type = #{dictType}
+            </if>
+            <if test="dictLabel != null and dictLabel != ''">
+                AND dict_label like concat('%', #{dictLabel}, '%')
+            </if>
+            <if test="dictValue != null and dictValue != ''">
+                AND dict_value = #{dictValue}
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+            <if test="remark != null and remark != ''">
+                AND remark like concat('%', #{remark}, '%')
+            </if>
+        </where>
+        order by dict_sort asc
+    </select>
+
     <select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
         <include refid="selectDictDataVo"/>
         where status = '0' and dict_type = #{dictType} order by dict_sort asc
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseDictDataController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseDictDataController.java
index d580e1f4..6b96945c 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseDictDataController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseDictDataController.java
@@ -44,12 +44,7 @@ public class BaseDictDataController extends BaseController {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         return getDataTable(list);
     }
-    @GetMapping("/getDictData")
-    @DS("#header.poolName")
-    public AjaxResult getDict(SysDictData dictData) {
-        List<SysDictData> list = dictDataService.getDictDataList(dictData);
-        return success(list);
-    }
+
 
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @RequiresPermissions("factory:dict:export")
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseDictDataMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseDictDataMapper.java
index c8ec1d80..bdf437d8 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseDictDataMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseDictDataMapper.java
@@ -93,5 +93,5 @@ public interface BaseDictDataMapper {
      */
     public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
 
-    List<SysDictData> getDictDataList(SysDictData dictData);
+
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseDictDataService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseDictDataService.java
index c85239c7..95c03b34 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseDictDataService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseDictDataService.java
@@ -59,5 +59,4 @@ public interface IBaseDictDataService {
      */
     public int updateDictData(SysDictData dictData);
 
-    List<SysDictData> getDictDataList(SysDictData dictData);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseDictDataServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseDictDataServiceImpl.java
index 91edf88f..defa7e78 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseDictDataServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseDictDataServiceImpl.java
@@ -30,10 +30,7 @@ public class BaseDictDataServiceImpl implements IBaseDictDataService {
         return dictDataMapper.selectDictDataList(dictData);
     }
 
-    @Override
-    public List<SysDictData> getDictDataList(SysDictData dictData) {
-        return dictDataMapper.getDictDataList(dictData);
-    }
+
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseDictDataMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseDictDataMapper.xml
index 7476aa1e..d5bcc7aa 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseDictDataMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseDictDataMapper.xml
@@ -41,36 +41,6 @@
         order by dict_sort asc
     </select>
 
-    <select id="getDictDataList" parameterType="SysDictType" resultMap="SysDictTypeResult">
-        select
-            CONCAT(dict_label,'[',dict_value,']') AS dict_label,
-            dict_code,
-            dict_sort,
-            dict_value,
-            dict_type,
-            status,
-            remark
-        from base_dict_data
-        <where>
-            <if test="dictType != null and dictType != ''">
-                AND dict_type = #{dictType}
-            </if>
-            <if test="dictLabel != null and dictLabel != ''">
-                AND dict_label like concat('%', #{dictLabel}, '%')
-            </if>
-            <if test="dictValue != null and dictValue != ''">
-                AND dict_value = #{dictValue}
-            </if>
-            <if test="status != null and status != ''">
-                AND status = #{status}
-            </if>
-            <if test="remark != null and remark != ''">
-                AND remark like concat('%', #{remark}, '%')
-            </if>
-        </where>
-        order by dict_sort asc
-
-    </select>
 
     <select id="selectDictDataByType" parameterType="SysDictType" resultMap="SysDictTypeResult">
         <include refid="selectDictDataVo"/>