于继渤 1 рік тому
батько
коміт
c5661edd00

+ 9 - 0
src/main/java/com/dk/mdm/mapper/mst/SaleChannelMapper.java

@@ -36,5 +36,14 @@ public interface SaleChannelMapper extends BaseMapper<SaleChannel> {
      * @date :  2023/1/4 9:39
      * @date :  2023/1/4 9:39
      */
      */
     Integer updateBatchSaleChannelDisplayNo(List<Map<String,Object>> dataIds);
     Integer updateBatchSaleChannelDisplayNo(List<Map<String,Object>> dataIds);
+
+
+
+    /**
+     * @desc : 修改默认
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    Integer updateFlgDefault(Integer id);
 }
 }
 
 

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

@@ -115,7 +115,7 @@
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_sale_channel
         FROM dkic_b.t_mst_sale_channel
         <include refid="Condition"/>
         <include refid="Condition"/>
-        order by display_no
+        order by CASE WHEN flg_default = true THEN 0 ELSE 1 END, display_no
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
             limit #{end} offset #{start}
         </if>
         </if>
@@ -197,4 +197,13 @@
             WHERE channel_id = #{item.id}::uuid
             WHERE channel_id = #{item.id}::uuid
         </foreach>
         </foreach>
     </update>
     </update>
+
+
+
+    <update id="updateFlgDefault">
+        UPDATE dkic_b.t_mst_sale_channel
+        SET
+            flg_default = false
+        WHERE    cp_id = #{id} AND (flg_default = true OR flg_default is null)
+    </update>
 </mapper>
 </mapper>

+ 5 - 0
src/main/java/com/dk/mdm/mapper/mst/WarehouseMapper.java

@@ -40,6 +40,11 @@ public interface WarehouseMapper extends BaseMapper<Warehouse>{
      * @date :  2023/1/4 9:39
      * @date :  2023/1/4 9:39
      */
      */
     Integer updateBatchWarehouseDisplayNo(List<Map<String,Object>> dataIds);
     Integer updateBatchWarehouseDisplayNo(List<Map<String,Object>> dataIds);
+    /**
+     * @desc : 修改默认
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
     Integer updateFlgDefault(Integer id);
     Integer updateFlgDefault(Integer id);
 
 
 }
 }

+ 16 - 0
src/main/java/com/dk/mdm/service/mst/SaleChannelService.java

@@ -8,10 +8,12 @@ import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.mst.SaleChannelConvert;
 import com.dk.mdm.infrastructure.convert.mst.SaleChannelConvert;
+import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.model.pojo.mst.SaleChannel;
 import com.dk.mdm.model.pojo.mst.SaleChannel;
 import com.dk.mdm.mapper.mst.SaleChannelMapper;
 import com.dk.mdm.mapper.mst.SaleChannelMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.mst.Warehouse;
 import com.dk.mdm.model.query.mst.SaleChannelQuery;
 import com.dk.mdm.model.query.mst.SaleChannelQuery;
 import com.dk.mdm.model.response.mst.SaleChannelResponse;
 import com.dk.mdm.model.response.mst.SaleChannelResponse;
 import com.dk.mdm.model.response.mst.WarehouseResponse;
 import com.dk.mdm.model.response.mst.WarehouseResponse;
@@ -44,6 +46,10 @@ public class SaleChannelService extends BaseService<SaleChannel> {
 	@Autowired
 	@Autowired
 	private SaleChannelConvert saleChannelConvert;
 	private SaleChannelConvert saleChannelConvert;
 
 
+
+	@Autowired
+	private AuthUtils authUtils;
+
 	/**
 	/**
 	 * @desc : 重写主键
 	 * @desc : 重写主键
 	 * @author : 于继渤
 	 * @author : 于继渤
@@ -91,6 +97,11 @@ public class SaleChannelService extends BaseService<SaleChannel> {
 		if(saleChannelResponses.size() > 0){
 		if(saleChannelResponses.size() > 0){
 			return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SALECHANNEL_NAME_NOT.getMessage());
 			return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SALECHANNEL_NAME_NOT.getMessage());
 		}else{
 		}else{
+			//新建如果是默认取消其他默认
+			if(saleChannelVO.getFlgDefault()){
+				//默认  把其他置为非默认
+				saleChannelMapper.updateFlgDefault(authUtils.getStaff().getCpId());
+			}
 			//新建
 			//新建
 			saleChannelMapper.insert(saleChannel);
 			saleChannelMapper.insert(saleChannel);
 		}
 		}
@@ -112,6 +123,11 @@ public class SaleChannelService extends BaseService<SaleChannel> {
 			rollbackFor = {Exception.class}
 			rollbackFor = {Exception.class}
 	)
 	)
 	public ResponseResultVO<?> update(SaleChannelVO saleChannelVO) {
 	public ResponseResultVO<?> update(SaleChannelVO saleChannelVO) {
+		SaleChannel saleChannel1 = saleChannelMapper.selectById(saleChannelVO.getChannelId());
+		if ((saleChannel1.getFlgDefault() == null || !saleChannel1.getFlgDefault()) && saleChannelVO.getFlgDefault() != null && saleChannelVO.getFlgDefault()) {
+			//默认  把其他置为非默认
+			saleChannelMapper.updateFlgDefault(saleChannelVO.getCpId());
+		}
 		SaleChannel saleChannel = saleChannelConvert.convertToPo(saleChannelVO);
 		SaleChannel saleChannel = saleChannelConvert.convertToPo(saleChannelVO);
 		super.updateByUuid(saleChannel);
 		super.updateByUuid(saleChannel);
 		return ResponseResultUtil.success();
 		return ResponseResultUtil.success();