序号修改

src/main/java/com/dk/mdm/mapper/mst/DictionaryDataMapper.java

@@ -29,12 +29,7 @@ public interface DictionaryDataMapper extends BaseMapper<DictionaryData>{
      * @date : 2024/2/26 10:36
      */
     Long countByCond(DictionaryDataQuery dictionaryDataQuery);
-    /**
-     * @desc   : 查询排序
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    Integer selectDisplayNo(DictionaryDataQuery dictionaryDataQuery);
+
     /**
      * @desc : 批量编辑序号
      * @author : 于继渤

src/main/java/com/dk/mdm/mapper/mst/DictionaryDataMapper.xml

@@ -191,10 +191,7 @@
     </insert>
 
 
-    <select id="selectDisplayNo" resultType="Integer">
-        SELECT MAX(display_no) + 1  FROM dkic_b.t_mst_dictionary_data
-        <include refid="Condition"/>
-    </select>
+
 
     <update id="updateBatchDictionaryDataDisplayNo">
         <foreach collection="list" index="index" item="item" separator=";">

src/main/java/com/dk/mdm/mapper/mst/GoodsBrandMapper.java

@@ -28,12 +28,7 @@ public interface GoodsBrandMapper extends BaseMapper<GoodsBrand>{
      * @date : 2024/2/26 10:36
      */
     Long countByCond(GoodsBrandQuery goodsBrandQuery);
-    /**
-     * @desc   : 查询排序
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    Integer selectDisplayNo(GoodsBrandQuery goodsBrandQuery);
+
     Integer saveSupplierBrand(String supId,String brandId);
 }
 

src/main/java/com/dk/mdm/mapper/mst/GoodsBrandMapper.xml

@@ -176,12 +176,6 @@
 
 
 
-    <select id="selectDisplayNo" resultType="Integer">
-        SELECT MAX(display_no) + 1  FROM dkic_b.t_mst_goods_brand
-        <include refid="Condition"/>
-    </select>
-
-
     <insert id="saveSupplierBrand">
         insert into dkic_b.t_mst_supplier_brand
             (sup_id, brand_id)

src/main/java/com/dk/mdm/mapper/mst/GoodsCategoryMapper.java

@@ -32,12 +32,7 @@ public interface GoodsCategoryMapper extends BaseMapper<GoodsCategory> {
     Long countByCond(GoodsCategoryQuery goodsCategoryQuery);
 
 
-    /**
-     * @desc : 查询排序
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    Integer selectDisplayNo(GoodsCategoryQuery goodsCategoryQuery);
+
 
 
     /**

src/main/java/com/dk/mdm/mapper/mst/GoodsCategoryMapper.xml

@@ -215,10 +215,7 @@
     </insert>
 
 
-    <select id="selectDisplayNo" resultType="Integer">
-        SELECT MAX(display_no) + 1 FROM dkic_b.t_mst_goods_category
-        <include refid="Condition"/>
-    </select>
+
 
 
     <select id="resetLevelGoodsCategory" resultType="java.lang.Boolean">

src/main/java/com/dk/mdm/mapper/mst/GoodsSeriesMapper.java

@@ -35,12 +35,7 @@ public interface GoodsSeriesMapper extends BaseMapper<GoodsSeries>{
      * @date : 2024/2/26 10:36
      */
     Long countByCond(GoodsSeriesQuery goodsSeriesQuery);
-    /**
-     * @desc   : 查询排序
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    Integer selectDisplayNo(GoodsSeriesQuery goodsSeriesQuery);
+
 
 }
 

src/main/java/com/dk/mdm/mapper/mst/GoodsSeriesMapper.xml

@@ -166,10 +166,6 @@
 
 
 
-    <select id="selectDisplayNo" resultType="Integer">
-        SELECT MAX(display_no) + 1 FROM dkic_b.t_mst_goods_series
-        <include refid="Condition"/>
-    </select>
 
 
 </mapper>

src/main/java/com/dk/mdm/mapper/mst/RoleMapper.java

@@ -29,12 +29,7 @@ public interface RoleMapper extends BaseMapper<Role>{
     Long countByCond(RoleQuery roleQuery);
 
 
-    /**
-     * @desc   : 查询序号（数量）
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    Integer selectDisplayNo(RoleQuery roleQuery);
+
 
 }
 

src/main/java/com/dk/mdm/mapper/mst/RoleMapper.xml

@@ -139,10 +139,7 @@
         <include refid="Condition"/>
     </select>
 
-    <select id="selectDisplayNo" resultType="Integer">
-        SELECT MAX(display_no) + 1  FROM dkic_b.t_mst_role
-        <include refid="Condition"/>
-    </select>
+
 
 
 

src/main/java/com/dk/mdm/mapper/mst/SaleChannelMapper.java

@@ -29,12 +29,6 @@ public interface SaleChannelMapper extends BaseMapper<SaleChannel> {
     Long countByCond(SaleChannelQuery saleChannelQuery);
 
 
-    /**
-     * @desc : 查询排序
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    Integer selectDisplayNo(SaleChannelQuery saleChannelQuery);
 
     /**
      * @desc : 批量编辑序号

src/main/java/com/dk/mdm/mapper/mst/SaleChannelMapper.xml

@@ -173,10 +173,7 @@
         </foreach>
     </insert>
 
-    <select id="selectDisplayNo" resultType="Integer">
-        SELECT MAX(display_no) + 1  FROM dkic_b.t_mst_sale_channel
-        <include refid="Condition"/>
-    </select>
+
 
 
     <update id="updateBatchSaleChannelDisplayNo">

src/main/java/com/dk/mdm/mapper/mst/UnitMapper.java

@@ -27,12 +27,7 @@ public interface UnitMapper extends BaseMapper<Unit>{
      * @date : 2024/2/26 10:36
      */
     Long countByCond(UnitQuery UnitQuery);
-    /**
-     * @desc   : 查询排序
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    Integer selectDisplayNo(UnitQuery UnitQuery);
+
 
 }
 

src/main/java/com/dk/mdm/mapper/mst/UnitMapper.xml

@@ -163,9 +163,5 @@
 
 
 
-    <select id="selectDisplayNo" resultType="Integer">
-        SELECT MAX(display_no) + 1 FROM dkic_b.t_mst_unit
-        <include refid="Condition"/>
-    </select>
 
 </mapper>

src/main/java/com/dk/mdm/mapper/mst/WarehouseMapper.java

@@ -32,12 +32,7 @@ public interface WarehouseMapper extends BaseMapper<Warehouse>{
     Long countByCond(WarehouseQuery warehouseQuery);
 
 
-    /**
-     * @desc   : 查询排序
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    Integer selectDisplayNo(WarehouseQuery warehouseQuery);
+
     /**
      * @desc : 批量编辑序号
      * @author : 于继渤

src/main/java/com/dk/mdm/mapper/mst/WarehouseMapper.xml

@@ -198,8 +198,5 @@
     </update>
 
 
-    <select id="selectDisplayNo" resultType="Integer">
-        SELECT MAX(display_no) + 1  FROM dkic_b.t_mst_warehouse
-        <include refid="Condition"/>
-    </select>
+
 </mapper>

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

@@ -1,6 +1,7 @@
 package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -74,14 +76,10 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 	public ResponseResultVO<?> insert(DictionaryDataVO dictionaryDataVO) {
 		//实体转换
 		DictionaryData dictionaryData = dictionaryDataConvert.convertToPo(dictionaryDataVO);
-
-		Integer displayNo = dictionaryDataMapper.selectDisplayNo(new DictionaryDataQuery());
-		if (displayNo != null) {
-			//插入序号
-			dictionaryData.setDisplayNo(displayNo);
-		} else {
-			dictionaryData.setDisplayNo(0);
-		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("dictCode",dictionaryDataVO.getDictCode());
+		//设置序号
+		dictionaryData.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.DICTIONARYDATA,map));
 		//设置编码
 		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(dictionaryDataVO.getDictCode(), true);
 		dictionaryData.setDataId(uniqueNoteCode.get("outId").toString());

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

@@ -82,13 +82,8 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
         //实体转换
         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);
-        }
+        //设置序号
+        goodsBrand.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.GOODSBRAND));
         //设置编码
         Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.BRAND.getName(), true);
         goodsBrand.setBrandId(uniqueNoteCode.get("outId").toString());

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

@@ -80,17 +80,13 @@ public class GoodsCategoryService extends BaseService<GoodsCategory> {
     public ResponseResultVO<?> insert(GoodsCategoryVO goodsCategoryVO) {
         //实体转换
         GoodsCategory goodsCategory = goodsCategoryConvert.convertToPo(goodsCategoryVO);
-        Integer displayNo = goodsCategoryMapper.selectDisplayNo(new GoodsCategoryQuery());
-        if (displayNo != null) {
-            //插入序号
-            goodsCategory.setDisplayNo(displayNo);
-        } else {
-            goodsCategory.setDisplayNo(0);
-        }
+        //设置序号
+        goodsCategory.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.GOODSSERIES));
         if (goodsCategory.getParentId() != null) {
             //插入TOPid
             goodsCategory.setTopId(goodsCategory.getParentId());
         }
+
         //设置编码
         Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.CATEGORY.getName(), true);
         goodsCategory.setCatId(uniqueNoteCode.get("outId").toString());

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

@@ -90,14 +90,9 @@ public class GoodsSeriesService extends BaseService<GoodsSeries> {
 	public ResponseResultVO<?> insert(GoodsSeriesVO goodsSeriesVO) {
 		//实体转换
 		GoodsSeries goodsSeries = goodsSeriesConvert.convertToPo(goodsSeriesVO);
-		//查询序号
-		Integer displayNo = goodsSeriesMapper.selectDisplayNo(new GoodsSeriesQuery());
-		if (displayNo != null) {
-			//插入序号
-			goodsSeries.setDisplayNo(displayNo);
-		} else {
-			goodsSeries.setDisplayNo(0);
-		}
+
+		//设置序号
+		goodsSeries.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.GOODSSERIES));
 		//设置编码
 		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.SERIES.getName(), true);
 		goodsSeries.setSeriesId(uniqueNoteCode.get("outId").toString());

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

@@ -83,15 +83,8 @@ public class RoleService extends BaseService<Role> {
     )
     public ResponseResultVO<?> saveRole(RoleVo roleVO) {
         Role role = roleConvert.convertToPo(roleVO);
-        //Integer displayNo = roleMapper.selectDisplayNo(new RoleQuery());
         // 获取显示顺序
-        Integer displayNo =commonService.getMaxDisplayNo(Constant.DisplayNoTable.ROLE);
-        if (displayNo != null) {
-            //插入序号
-            role.setDisplayNo(displayNo);
-        } else {
-            role.setDisplayNo(0);
-        }
+        role.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.ROLE));
         //设置编码
         Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.ROLE.getName(), true);
         role.setRoleId(uniqueNoteCode.get("outId").toString());

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

@@ -75,14 +75,8 @@ public class SaleChannelService extends BaseService<SaleChannel> {
 	public ResponseResultVO<?> insert(SaleChannelVO saleChannelVO) {
 		//实体转换
 		SaleChannel saleChannel = saleChannelConvert.convertToPo(saleChannelVO);
-
-		Integer displayNo = saleChannelMapper.selectDisplayNo(new SaleChannelQuery());
-		if (displayNo != null) {
-			//插入序号
-			saleChannel.setDisplayNo(displayNo);
-		} else {
-			saleChannel.setDisplayNo(0);
-		}
+		//设置序号
+		saleChannel.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.SALECHANNEL));
 		//设置编码
 		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.SALECHANNEL.getName(), true);
 		saleChannel.setChannelId(uniqueNoteCode.get("outId").toString());

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

@@ -74,9 +74,8 @@ public class UnitService extends BaseService<Unit> {
 	public ResponseResultVO<?> insert(UnitVO unitVO) {
 		//实体转换
 		Unit unit = unitConvert.convertToPo(unitVO);
-		Integer displayNo = unitMapper.selectDisplayNo(new UnitQuery());
 		//设置序号
-		unit.setDisplayNo(displayNo);
+		unit.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.UNIT));
 		//设置编码
 		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.UNIT.getName(), true);
 		unit.setUnitId(uniqueNoteCode.get("outId").toString());

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

@@ -74,13 +74,8 @@ public class WarehouseService extends BaseService<Warehouse> {
 	public ResponseResultVO<?> insert(WarehouseVO warehouseVO) {
 		//实体转换
 		Warehouse warehouse = warehouseConvert.convertToPo(warehouseVO);
-		Integer displayNo = warehouseMapper.selectDisplayNo(new WarehouseQuery());
-		if (displayNo != null) {
-			//插入序号
-			warehouse.setDisplayNo(displayNo);
-		} else {
-			warehouse.setDisplayNo(0);
-		}
+		//设置序号
+		warehouse.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.WAREHOUSE));
 		//设置编码
 		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.WAREHOUSE.getName(), true);
 		warehouse.setWhId(uniqueNoteCode.get("outId").toString());