商品档案

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

@@ -4,6 +4,8 @@ import com.dk.common.controller.BaseController;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.mst.GoodsBrandQuery;
+import com.dk.mdm.model.response.mst.GoodsBrandResponse;
 import com.dk.mdm.service.common.CommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -1426,6 +1428,17 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<PageList<Map<String, Object>>> getSupplierByPage(@RequestBody Map<String, Object> param) {
         return commonService.getSupplierByPage(param);
     }
+    /**
+     * @desc : 条件查询
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"goods_brand_list_by"})
+    public ResponseResultVO<PageList<Map<String, Object>>> goodsBrandListBy(@RequestBody Map<String, Object> param) {
+        return commonService.goodsBrandListBy(param);
+    }
+
 }
 
 

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

@@ -973,4 +973,19 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @date   : 2024/3/1 9:21
      */
     Long countSupplier(Map<String, Object> param);
+
+
+    /**
+     * @desc   : 获取商品品牌
+     * @author : 王英杰
+     * @date   : 2024/3/1 9:21
+     */
+    List<Map<String, Object>> getGoodsBrand(Map param);
+
+    /**
+     * @desc   : 获取商品品牌数量
+     * @author : 王英杰
+     * @date   : 2024/3/1 9:21
+     */
+    Long countGoodsBrand(Map<String, Object> param);
 }

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

@@ -2931,4 +2931,37 @@
             AND tms.sup_code LIKE concat('%', #{supplierCode}, '%')
         </if>
     </select>
+    <select id="getGoodsBrand" resultType="java.util.Map">
+        SELECT
+        tmgb.flg_valid AS "flgValid",
+        tmgb.brand_id AS "brandId", tmgb.brand_code AS "brandCode", tmgb.brand_name  AS "brandName",
+        (SELECT  COALESCE(array_to_string(array_agg(tsm.sup_name), ','),'')
+        FROM dkic_b.t_mst_supplier_brand tsmb
+        left join dkic_b.t_mst_supplier tsm on tsm.sup_id = tsmb.sup_id
+        WHERE tsmb.brand_id  =  tmgb.brand_id) AS "supplierName"
+        FROM dkic_b.t_mst_goods_brand tmgb
+        <where>
+            <if test="searchText !=null">
+                AND ( tmgb.brand_name LIKE concat('%', #{searchText}, '%')
+            </if>
+        </where>
+        order by display_no asc
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+
+
+    </select>
+
+    <!-- 查询表t_mst_goods_brand，（条件查询）个数 -->
+    <select id="countGoodsBrand" resultType="Long">
+        SELECT
+        count(1)
+        FROM dkic_b.t_mst_goods_brand tmgb
+        <where>
+            <if test="brandName != null and brandName != ''">
+                AND tmgb.brand_name = #{brandName}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1386,4 +1386,29 @@ public class CommonService extends BaseService<Map<String, Object>> {
         data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage")).setList(list).setTotal(total);
         return ResponseResultUtil.success(data);
     }
+
+    /**
+     * @desc   : 获取商品品牌（分页）
+     * @author : 王英杰
+     * @date   : 2024/3/1 9:20
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> goodsBrandListBy(Map<String, Object> param) {
+        // 校验分页参数
+        if (param.get("pageSize") == null || param.get("currentPage") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
+        }
+        // 分页参数赋值
+        param = this.getLimit(param);
+        // 定义返回值
+        PageList data = new PageList<>();
+        // 获取公司
+        List<Map<String, Object>> list = commonMapper.getGoodsBrand(param);
+        // 获取总数量
+        Long total = commonMapper.countGoodsBrand(param);
+        // 组装返回值
+        data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage")).setList(list).setTotal(total);
+        return ResponseResultUtil.success(data);
+    }
+
+
 }

src/main/java/com/dk/mdm/service/mst/GoodsBrandService.java

@@ -33,94 +33,93 @@ import java.util.Map;
 @Transactional
 public class GoodsBrandService extends BaseService<GoodsBrand> {
 
-	@Override
-	public BaseMapper<GoodsBrand> getRepository() {
-		return goodsBrandMapper;
-	}
-
-	@Autowired
-	private GoodsBrandMapper goodsBrandMapper;
-
-
-
-	@Autowired
-	private GoodsBrandConvert goodsBrandConvert;
-
-	@Autowired
-	private CommonService commonService;
-
-	/**
-	 * @desc : 重写主键
-	 * @author : 于继渤
-	 * @date : 2024/2/29 20:29
-	 */
-	@Override
-	public String getPrimaryKey() {
-		return "brand_id";
-	}
-	/**
-	 * @desc : 查询
-	 * @author : 于继渤
-	 * @date : 2023/1/5 9:39
-	 */
-	@Pagination
-	public ResponseResultVO<PageList<GoodsBrandResponse>> selectByCond(GoodsBrandQuery goodsBrandQuery) {
-		return super.mergeListWithCount(goodsBrandQuery, goodsBrandMapper.selectByCond(goodsBrandQuery),
-				goodsBrandMapper.countByCond(goodsBrandQuery));
-	}
-
-
-
-	/**
-	 * @desc : 新建
-	 * @author : 于继渤
-	 * @date : 2023/1/5 9:39
-	 */
-	@Transactional(
-			rollbackFor = {Exception.class}
-	)
-	public ResponseResultVO<?> insert(GoodsBrandVO goodsBrandVO) {
-		//实体转换
-		GoodsBrand goodsBrand = goodsBrandConvert.convertToPo(goodsBrandVO);
-		goodsBrand.setShortName(goodsBrand.getBrandName());
-		Integer displayNo = goodsBrandMapper.selectDisplayNo(new GoodsBrandQuery());
-		if (displayNo != null) {
-			//插入序号
-			goodsBrand.setDisplayNo(displayNo);
-		} else {
-			goodsBrand.setDisplayNo(0);
-		}
-		//设置编码
-		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.BRAND.getName(), true);
-		goodsBrand.setBrandId(uniqueNoteCode.get("outId").toString());
-		goodsBrand.setBrandCode(uniqueNoteCode.get("outNote").toString());
-		//新建
-		goodsBrandMapper.insert(goodsBrand);
-
-		//保存供应商
-		List<String> supplierIds = goodsBrandVO.getSupplierIds();
-		for (String supplierId : supplierIds) {
-			goodsBrandMapper.saveSupplierBrand(supplierId,goodsBrand.getBrandId());
-		}
-		return ResponseResultUtil.success();
-	}
-
-
-
-	/**
-	 * @desc : 编辑
-	 * @author : 于继渤
-	 * @date : 2023/1/5 9:39
-	 */
-	@Transactional(
-			rollbackFor = {Exception.class}
-	)
-	public ResponseResultVO<?> updateGoodsBrand(GoodsBrandVO goodsBrandVO) {
-		GoodsBrand goodsBrand = goodsBrandConvert.convertToPo(goodsBrandVO);
-		super.updateByUuid(goodsBrand);
-		return ResponseResultUtil.success();
-	}
-
+    @Override
+    public BaseMapper<GoodsBrand> getRepository() {
+        return goodsBrandMapper;
+    }
+
+    @Autowired
+    private GoodsBrandMapper goodsBrandMapper;
+
+
+    @Autowired
+    private GoodsBrandConvert goodsBrandConvert;
+
+    @Autowired
+    private CommonService commonService;
+
+    /**
+     * @desc : 重写主键
+     * @author : 于继渤
+     * @date : 2024/2/29 20:29
+     */
+    @Override
+    public String getPrimaryKey() {
+        return "brand_id";
+    }
+
+    /**
+     * @desc : 查询
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
+    @Pagination
+    public ResponseResultVO<PageList<GoodsBrandResponse>> selectByCond(GoodsBrandQuery goodsBrandQuery) {
+        return super.mergeListWithCount(goodsBrandQuery, goodsBrandMapper.selectByCond(goodsBrandQuery),
+                goodsBrandMapper.countByCond(goodsBrandQuery));
+    }
+
+
+    /**
+     * @desc : 新建
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<?> insert(GoodsBrandVO goodsBrandVO) {
+        //实体转换
+        GoodsBrand goodsBrand = goodsBrandConvert.convertToPo(goodsBrandVO);
+        goodsBrand.setShortName(goodsBrand.getBrandName());
+        Integer displayNo = goodsBrandMapper.selectDisplayNo(new GoodsBrandQuery());
+        if (displayNo != null) {
+            //插入序号
+            goodsBrand.setDisplayNo(displayNo);
+        } else {
+            goodsBrand.setDisplayNo(0);
+        }
+        //设置编码
+        Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.BRAND.getName(), true);
+        goodsBrand.setBrandId(uniqueNoteCode.get("outId").toString());
+        goodsBrand.setBrandCode(uniqueNoteCode.get("outNote").toString());
+        //新建
+        goodsBrandMapper.insert(goodsBrand);
+
+        //保存供应商
+        List<String> supplierIds = goodsBrandVO.getSupplierIds();
+        if (supplierIds != null) {
+            for (String supplierId : supplierIds) {
+                goodsBrandMapper.saveSupplierBrand(supplierId, goodsBrand.getBrandId());
+            }
+        }
+        return ResponseResultUtil.success();
+    }
+
+
+    /**
+     * @desc : 编辑
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<?> updateGoodsBrand(GoodsBrandVO goodsBrandVO) {
+        GoodsBrand goodsBrand = goodsBrandConvert.convertToPo(goodsBrandVO);
+        super.updateByUuid(goodsBrand);
+        return ResponseResultUtil.success();
+    }
 
 
 }