提交新增合同文件校验

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

@@ -39,4 +39,8 @@ public class QueryLogisticListReq extends PageReq implements Serializable {
      */
     @Schema(description = "承运单位id")
     private String carriageCompanyId;
+    /**
+     * 状态
+     */
+    private String status;
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/repository/KwcContractLogisticsRepository.java

@@ -23,12 +23,14 @@ import java.util.Set;
 @Repository
 public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogisticsMapper, KwcContractLogistics> {
     public IPage<KwcContractLogistics> queryByPage(int pageNum, int pageSize, String contractNo, String contractName,
+                                                   String status,
                                                    List<Long> entIdList) {
         return page(new Page<>(pageNum, pageSize), Wrappers.<KwcContractLogistics>lambdaQuery()
                 .eq(KwcContractLogistics::getDelFlag, 0)
                 .in(CollectionUtils.isNotEmpty(entIdList), KwcContractLogistics::getEntId, entIdList)
                 .like(StringUtils.isNotBlank(contractNo), KwcContractLogistics::getContractNo, contractNo)
                 .like(StringUtils.isNotBlank(contractName), KwcContractLogistics::getName, contractName)
+                .eq(StringUtils.isNotBlank(status), KwcContractLogistics::getStatus, status)
                 .orderByDesc(KwcContractLogistics::getCreateTime)
                 .orderByDesc(KwcContractLogistics::getId));
     }

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

@@ -1056,7 +1056,7 @@ public class KwcContractLogisticsService {
 
         IPage<KwcContractLogistics> page =kwcContractLogisticsRepository.queryByPage(req.getPageNum(),req.getPageSize(),
                 req.getContractNo(),
-                req.getContractName(),entIdList);
+                req.getContractName(),req.getStatus(),entIdList);
         List<KwcContractLogistics> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return PageDataResult.empty(req.getPageNum(),req.getPageSize());

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

@@ -1385,7 +1385,7 @@ public class KwcContractTradeService {
         ContractDetailResp.TradeBaseInfo baseInfo = getBaseInfo(ctTypeKeyAndUnitMap, kwcContractTrade);
         contractDetailResp.setBaseInfo(baseInfo);
         //文件合同
-        contractDetailResp.setContractFile(kwcContractTrade.getSignedUrl());
+        contractDetailResp.setContractFile(kwcContractTrade.getSigningUrl());
 
         //标地信息
         if (CollectionUtils.isNotEmpty(tradeGoods)){
@@ -1454,6 +1454,8 @@ public class KwcContractTradeService {
     }
 
     public PageDataResult<QueryListResVo> queryTradeListByPage(QueryTradeReq req) {
+
+        Long entId = StringUtils.isNotBlank(req.getEntId()) ? Long.valueOf(req.getEntId()) : null;
         Set<Long> entIds = Sets.newHashSet();
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getPurchaseEntId())) {
             //查询企业 信息
@@ -1473,13 +1475,16 @@ public class KwcContractTradeService {
         if (StringUtils.isBlank(req.getEntId())) {
             req.setEntId(String.valueOf(LoginUserHolder.getEntId()));
         }
-        allEnt.add(Long.valueOf(req.getEntId()));
-        EntCacheResDto entCacheResDto = remoteSystemService.queryEntTreeById(Long.valueOf(req.getEntId()));
-        if (Objects.nonNull(entCacheResDto)) {
-            EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntTreeById(entCacheResDto.getId());
-            List<EntCacheResDto> child = entCacheResDto1.getChild();
-            if (CollectionUtils.isNotEmpty(child)) {
-                allEnt.addAll(child.stream().map(EntCacheResDto::getId).toList());
+
+        if (Objects.nonNull(entId)) {
+         allEnt.add(entId);
+         EntCacheResDto entCacheResDto = remoteSystemService.queryEntTreeById(entId);
+            if (Objects.nonNull(entCacheResDto)) {
+                EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntTreeById(entCacheResDto.getId());
+                List<EntCacheResDto> child = entCacheResDto1.getChild();
+                if (CollectionUtils.isNotEmpty(child)) {
+                    allEnt.addAll(child.stream().map(EntCacheResDto::getId).toList());
+                }
             }
         }
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/TradeOrderManageService.java

@@ -320,7 +320,11 @@ public class TradeOrderManageService {
         }
 
         //查询供应企业
-        List<KwoTradeOrderUnit> kwoTradeOrderUnits = tradeOrderUnitRepository.queryByEntIds(entIds);
+        List<KwoTradeOrderUnit> kwoTradeOrderUnits = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(entIds)){
+            kwoTradeOrderUnits = tradeOrderUnitRepository.queryByEntIds(entIds);
+        }
+
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(kwoTradeOrderUnits)){
             orderIds.addAll(kwoTradeOrderUnits.stream()
                     .map(KwoTradeOrderUnit::getTOrderId)