添加分页

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -73,7 +73,7 @@ public class CommonController extends BaseController<Map<String, Object>> {
             notes = "获取系统表数据种类"
     )
     @PostMapping("get_data_kind")
-    public ResponseResultVO<List<Map<String, Object>>> getDataKind(@RequestBody Map<String, Object> param) {
+    public ResponseResultVO<PageList<Map<String, Object>>> getDataKind(@RequestBody Map<String, Object> param) {
         return commonService.getDataKind(param);
     }
 

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -57,6 +57,8 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      */
     List<Map<String, Object>> getDataKind(Map param);
 
+    Long getDataKindCount(Map param);
+
     /**
      * @desc : 获取组织部门
      * @author : 姜宁

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -154,8 +154,31 @@
             AND kind_code =any(#{kindCodeList,typeHandler=StringListTypeHandler})
         </if>
         order by display_no
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <select id="getDataKindCount" resultType="Long">
+        select
+        count(1)
+        from sys.t_data_kind
+        where flg_valid
+        <if test="kindType != null">
+            AND kind_type = #{kindType}
+        </if>
+        <if test="usedFlag != null">
+            AND kind_tags -> 'used' ?? '标签'
+        </if>
+        <if test="kindTag != null">
+            AND kind_tags -> 'used' ?? #{kindTag}
+        </if>
+        <if test="kindCodeList != null and kindCodeList.size()>0">
+            AND kind_code =any(#{kindCodeList,typeHandler=StringListTypeHandler})
+        </if>
     </select>
 
+
     <!-- 获取组织部门 -->
     <select id="getOrg" resultType="java.util.Map">
         select org_Id     AS "orgId",

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -589,8 +589,8 @@
         <include refid="Base_Column_List_Response"/>
         ,tpid.into_no as "intoNo"
         ,tmgs.sku_code  as "skuCode"
-        ,tmgs.sku_model as "skuModel"
-        ,tmgs.sku_name  as "skuName"
+        ,tpii.sku_model as "skuModel"
+        ,tpii.sku_name  as "skuName"
         ,tmgs.sku_spec  as "skuSpec"
         ,tmgb.brand_name  as "brandName"
         ,tmgb.short_name  as "shortName"

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -160,10 +160,16 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 周兴
      * @date : 2023/1/6 11:41
      */
-    public ResponseResultVO<List<Map<String, Object>>> getDataKind(Map<String, Object> param) {
-        // 获取系统基础数据
-        List<Map<String, Object>> list = commonMapper.getDataKind(param);
-        return ResponseResultUtil.success(list);
+    public ResponseResultVO<PageList<Map<String, Object>>> getDataKind(Map<String, Object> param) {
+        // 校验分页参数
+        if (param.get("pageSize") == null || param.get("currentPage") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
+        }
+        // 分页参数赋值
+        param = this.getLimit(param);
+        return super.mergeListWithCount(param, commonMapper.getDataKind(param),
+                commonMapper.getDataKindCount(param));
+
     }
 
     /**