提交全图监控

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/QueryListReqVo.java

@@ -2,8 +2,10 @@ package com.sckw.contract.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.page.PageRequest;
+import com.sckw.core.web.request.PageReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
@@ -16,8 +18,9 @@ import java.util.List;
  * @desc 查询入参
  * @date 2023/7/13
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class QueryListReqVo extends PageRequest implements Serializable {
+public class QueryListReqVo extends PageReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5785283278707737826L;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -1303,6 +1303,16 @@ public class KwcContractLogisticsService {
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(goodsInfos)){
             return;
         }
+        // 检查goodsId是否有重复
+        Set<Long> goodsIdSet = new HashSet<>();
+        boolean hasDuplicate = goodsInfos.stream()
+                .map(LogisticListReq.TradeGoodsInfo::getGoodsId)
+                .anyMatch(goodsId -> !goodsIdSet.add(goodsId));
+
+        if (hasDuplicate) {
+            // 存在重复的goodsId
+            throw new BusinessException("商品不能重复");
+        }
         List<KwcContractLogisticsGoods> goods = goodsInfos.stream()
                 .map(x -> getKwcContractLogisticsGoods(x, contactId,baseInfo))
                 .collect(Collectors.toList());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -167,7 +167,7 @@ public class KwcContractTradeService {
         queryTradeReq.setPurchaseEntId(reqVo.getPurchaseEntId());
         queryTradeReq.setSupplyEntId(reqVo.getSupplyEntId());
         queryTradeReq.setStatus(reqVo.getStatus());
-        queryTradeReq.setPageNum(reqVo.getPage());
+        queryTradeReq.setPageNum(reqVo.getPageNum());
         queryTradeReq.setPageSize(reqVo.getPageSize());
 
         List<QueryListResVo> queryListResVoPageDataResult = queryTradeListByPage(queryTradeReq);
@@ -1011,7 +1011,7 @@ public class KwcContractTradeService {
      * @date: 2023/9/13
      */
     public PageResult queryTradeByPage(QueryListReqVo reqVo) {
-        PageHelper.startPage(reqVo.getPage(), reqVo.getPageSize());
+        PageHelper.startPage(reqVo.getPageNum(), reqVo.getPageSize());
 
         //新增客户经理权限过滤
         List<Long> authEntIdList = LoginUserHolder.getAuthEntIdList();