于继渤 2 年之前
父節點
當前提交
85b135d12c

+ 12 - 0
src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -452,6 +452,18 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
+     * @desc :  商品种类查询
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"get_goods_category_no_page"})
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryNoPage(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsCategoryNoPage(param);
+    }
+
+
+    /**
      * @desc :  计量单位查询
      * @author : 王英杰
      * @date : 2024/2/26 10:36

+ 1 - 1
src/main/java/com/dk/mdm/mapper/mst/CusFollowMapper.xml

@@ -168,7 +168,7 @@
             <if test="followStatus != null and followStatus != ''">
                 AND tccf.follow_status = #{followStatus}
             </if>
-      
+
             <if test="followOrg != null and followOrg != ''">
                 AND tccf.follow_org = #{followOrg}
             </if>

+ 1 - 1
src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.xml

@@ -81,7 +81,7 @@
                 AND tmgs.brand_id = #{brandId}
             </if>
             <if test="categoryId != null and categoryId != ''">
-                AND tmgs.category_id = #{categoryId}
+                AND tmgs.category_id = #{categoryId}::uuid
             </if>
             <if test="unitId != null and unitId != ''">
                 AND tmgs.unit_id = #{unitId}

+ 9 - 2
src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -648,8 +648,15 @@ public class CommonService extends BaseService<Map<String, Object>> {
                 commonMapper.getInventoryCountByPage(param));
     }
 
-
-
+    /**
+     * @desc :  商品种类查询
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryNoPage(Map<String, Object> param) {
+        List<Map<String, Object>> list = commonMapper.getGoodsCategory(param);
+        return ResponseResultUtil.success(list);
+    }
     /**
      * @desc : 获取页面数据源集合 (小程序用)
      * @author : 于继渤