提交全图监控

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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -55,9 +56,10 @@ public class KwcContractLogisticsUnitRepository extends ServiceImpl<KwcContractL
                 .eq(KwcContractLogisticsUnit::getDelFlag,0));
     }
 
-    public List<KwcContractLogisticsUnit> queryByEntIds(List<Long> entIdList) {
+    public List<KwcContractLogisticsUnit> queryByEntIds(List<Long> entIdList,Integer entType) {
        return list(Wrappers.<KwcContractLogisticsUnit>lambdaQuery()
                 .eq(KwcContractLogisticsUnit::getDelFlag,0)
+                .eq(Objects.nonNull(entType),KwcContractLogisticsUnit::getUnitType, entType)
                 .in(KwcContractLogisticsUnit::getEntId, entIdList));
     }
 }

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

@@ -7,6 +7,7 @@ import com.sckw.contract.model.entity.KwcContractTradeGoods;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -47,6 +48,6 @@ public class KwcContractTradeGoodsRepository extends ServiceImpl<KwcContractTrad
         return list(Wrappers.<KwcContractTradeGoods>lambdaQuery()
                 .eq(KwcContractTradeGoods::getDelFlag,0)
                 .in(KwcContractTradeGoods::getContractId, contractIds)
-                .eq(KwcContractTradeGoods::getGoodsId, goodsId));
+                .eq(Objects.nonNull(goodsId),KwcContractTradeGoods::getGoodsId, goodsId));
     }
 }

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

@@ -1065,16 +1065,19 @@ public class KwcContractLogisticsService {
 
         List<Long> entIdList = Lists.newArrayList();
         entIdList.add(entId);
+        Integer type = null;
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getConsignCompanyId())){
             entIdList.add(Long.valueOf(req.getConsignCompanyId()));
+            type =  1;
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getCarriageCompanyId())){
             entIdList.add(Long.valueOf(req.getCarriageCompanyId()));
+            type =  2;
         }
         //查询物流企业
         Set<Long> contractIdList = Sets.newHashSet();
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIdList)){
-            List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByEntIds(entIdList);
+            List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByEntIds(entIdList, type);
             if (CollectionUtils.isNotEmpty(units)) {
                 contractIdList = units.stream().map(KwcContractLogisticsUnit::getContractId).collect(Collectors.toSet());
             }
@@ -1567,20 +1570,30 @@ public class KwcContractLogisticsService {
         }
         List<Long> entIdList = Lists.newArrayList();
         entIdList.add(entId);
+        Integer type = null;
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getConsignCompanyId())){
             entIdList.add(Long.valueOf(req.getConsignCompanyId()));
+            type = 1;
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getCarriageCompanyId())){
             entIdList.add(Long.valueOf(req.getCarriageCompanyId()));
+            type = 2;
         }
         //查询物流企业
         Set<Long> contractIdList = Sets.newHashSet();
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIdList)){
-            List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByEntIds(entIdList);
+            List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByEntIds(entIdList,type);
             if (CollectionUtils.isNotEmpty(units)) {
                 contractIdList = units.stream().map(KwcContractLogisticsUnit::getContractId).collect(Collectors.toSet());
             }
         }
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractIdList) && org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIdList)){
+            Map<Integer, List<KwcContractLogistics>> statusAndLogOrdersMap = new HashMap<>();
+            List<ContractStatusCountResp.ContractStatusCount> statusCounts = statusEnums.stream()
+                    .map(x -> getContractStatusCount(x, statusAndLogOrdersMap))
+                    .collect(Collectors.toList());
+            contractStatusCountResp.setContractStatusInfo(statusCounts);
+        }
 
         if(org.apache.commons.collections4.CollectionUtils.isEmpty(contractIdList)
                 && !org.apache.commons.lang3.StringUtils.isAllBlank(req.getConsignCompanyId(),req.getCarriageCompanyId())){

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

@@ -1886,7 +1886,7 @@ public class KwcContractTradeService {
     }
 
     private static void checkParam(Long contractTradeOrderDto, Long contractTradeOrderDto1, Integer contractTradeOrderDto2) {
-        if (Objects.isNull(contractTradeOrderDto)) {
+        if (Objects.isNull(contractTradeOrderDto) && Objects.equals(contractTradeOrderDto2,1)) {
             throw new BusinessException("商品id不能为空！");
         }
         if (Objects.isNull(contractTradeOrderDto1)) {