提交全图监控

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

@@ -60,9 +60,7 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
     }
 
     public Boolean updateLogistics(KwcContractLogistics updateLogistics) {
-       return update(updateLogistics,
-                Wrappers.<KwcContractLogistics>lambdaQuery()
-                        .eq(KwcContractLogistics::getId, updateLogistics.getId()));
+       return updateById(updateLogistics);
     }
 
     public List<KwcContractLogistics> queryByEntId(Long entId) {

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

@@ -8,6 +8,7 @@ import com.sckw.contract.model.entity.KwcContractTradeUnit;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**

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

@@ -1068,18 +1068,23 @@ public class KwcContractLogisticsService {
         Integer type = null;
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getConsignCompanyId())){
             entIdList.add(Long.valueOf(req.getConsignCompanyId()));
-            type =  1;
+            type = CooperateTypeEnum.CONSIGN.getCode();
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getCarriageCompanyId())){
             entIdList.add(Long.valueOf(req.getCarriageCompanyId()));
-            type =  2;
+            type = CooperateTypeEnum.CARRIAGE.getCode();
         }
         //查询物流企业
         Set<Long> contractIdList = Sets.newHashSet();
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIdList)){
             List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByEntIds(entIdList, type);
             if (CollectionUtils.isNotEmpty(units)) {
-                contractIdList = units.stream().map(KwcContractLogisticsUnit::getContractId).collect(Collectors.toSet());
+                Set<Long> contractIds = units.stream().filter(x -> Objects.equals(x.getEntId(), entId))
+                        .map(KwcContractLogisticsUnit::getContractId)
+                        .collect(Collectors.toSet());
+                contractIdList = units.stream()
+                        .filter(x->contractIds.contains(x.getContractId()))
+                        .map(KwcContractLogisticsUnit::getContractId).collect(Collectors.toSet());
             }
         }
         if (CollectionUtils.isEmpty(contractIdList) && CollectionUtils.isNotEmpty(entIdList)){
@@ -1573,18 +1578,23 @@ public class KwcContractLogisticsService {
         Integer type = null;
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getConsignCompanyId())){
             entIdList.add(Long.valueOf(req.getConsignCompanyId()));
-            type = 1;
+            type = CooperateTypeEnum.CONSIGN.getCode();
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getCarriageCompanyId())){
             entIdList.add(Long.valueOf(req.getCarriageCompanyId()));
-            type = 2;
+            type = CooperateTypeEnum.CARRIAGE.getCode();
         }
         //查询物流企业
         Set<Long> contractIdList = Sets.newHashSet();
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIdList)){
             List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByEntIds(entIdList,type);
             if (CollectionUtils.isNotEmpty(units)) {
-                contractIdList = units.stream().map(KwcContractLogisticsUnit::getContractId).collect(Collectors.toSet());
+                Set<Long> contractIds = units.stream().filter(x -> Objects.equals(x.getEntId(), entId))
+                        .map(KwcContractLogisticsUnit::getContractId)
+                        .collect(Collectors.toSet());
+                contractIdList = units.stream()
+                        .map(KwcContractLogisticsUnit::getContractId)
+                        .filter(contractId ->contractIds.contains(contractId)).collect(Collectors.toSet());
             }
         }
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractIdList) && org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIdList)){

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

@@ -1502,21 +1502,28 @@ public class KwcContractTradeService {
         } else {
             entId = LoginUserHolder.getEntId();
         }
+       // Integer type = null;
         Set<Long> entIds = Sets.newHashSet();
         entIds.add(entId);
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getPurchaseEntId())) {
             //查询企业 信息
             entIds.add(Long.valueOf(req.getPurchaseEntId()));
+            //  type = CooperateTypeEnum.PURCHASER.getCode();
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getSupplyEntId())) {
             entIds.add(Long.valueOf(req.getSupplyEntId()));
+            //type = CooperateTypeEnum.SUPPLIER.getCode();
         }
         Set<Long> contractIds = null;
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIds)) {
             List<KwcContractTradeUnit> units = kwcContractTradeUnitRepository.queryByEntIds(entIds);
             if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(units)) {
+                Set<Long> contractIdList = units.stream().filter(x -> Objects.equals(x.getEntId(), entId))
+                        .map(KwcContractTradeUnit::getContractId)
+                        .collect(Collectors.toSet());
                 contractIds = units.stream()
                         .map(KwcContractTradeUnit::getContractId)
+                        .filter(contractIdList::contains)
                         .collect(Collectors.toSet());
             }
         }
@@ -1950,20 +1957,29 @@ public class KwcContractTradeService {
         } else {
             entId = LoginUserHolder.getEntId();
         }
+       // Integer type =null;
         Set<Long> entIds = Sets.newHashSet();
         entIds.add(entId);
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getPurchaseEntId())) {
             //查询企业 信息
             entIds.add(Long.valueOf(req.getPurchaseEntId()));
+           // type=CooperateTypeEnum.PURCHASER.getCode();
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getSupplyEntId())) {
             entIds.add(Long.valueOf(req.getSupplyEntId()));
+           // type=CooperateTypeEnum.SUPPLIER.getCode();
         }
         Set<Long> contractIds = null;
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIds)) {
             List<KwcContractTradeUnit> units = kwcContractTradeUnitRepository.queryByEntIds(entIds);
             if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(units)) {
-                contractIds = units.stream().map(KwcContractTradeUnit::getContractId).collect(Collectors.toSet());
+                Set<Long> contractList = units.stream().filter(x -> Objects.equals(x.getEntId(), entId))
+                        .map(KwcContractTradeUnit::getContractId)
+                        .collect(Collectors.toSet());
+                contractIds = units.stream()
+                        .map(KwcContractTradeUnit::getContractId)
+                        .filter(contractList::contains)
+                        .collect(Collectors.toSet());
             }
         }
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractIds)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtLogisticsOrderRepository.java

@@ -38,14 +38,13 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
                 .eq(KwtLogisticsOrder::getTOrderId, tradeId));
     }
 
-        public IPage<KwtLogisticsOrder> queryByPage(Set<Long> entIds,Set<Long> logisticsOrderIds,Long  tradeOrderId,String orderNo,
+        public IPage<KwtLogisticsOrder> queryByPage(Set<Long> logisticsOrderIds,Long  tradeOrderId,String orderNo,
                                                     String status,
                                                  String startTime, String endTime,  int pageNum, int pageSize) {
         return page(new Page<>(pageNum, pageSize),
                 Wrappers.<KwtLogisticsOrder>lambdaQuery()
                         .eq(KwtLogisticsOrder::getDelFlag, 0)
                         .in(CollectionUtils.isNotEmpty(logisticsOrderIds), KwtLogisticsOrder::getId, logisticsOrderIds)
-                        .in(CollectionUtils.isNotEmpty(entIds), KwtLogisticsOrder::getEntId, entIds)
                         .eq(Objects.nonNull(tradeOrderId),KwtLogisticsOrder::getTOrderId, tradeOrderId)
                         .eq(StringUtils.isNotBlank(status),KwtLogisticsOrder::getStatus, status)
                         .like(StringUtils.isNotBlank(orderNo),KwtLogisticsOrder::getLOrderNo, orderNo)
@@ -105,11 +104,10 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
                 .eq(KwtLogisticsOrder::getBillingMode, billingMethod));
     }
 
-    public List<KwtLogisticsOrder> queryList(Set<Long> allEnt, Set<Long> logOrderIds, Long tradeOrderId, String orderNo, String orderStatus, String startTime, String endTime) {
+    public List<KwtLogisticsOrder> queryList( Set<Long> logOrderIds, Long tradeOrderId, String orderNo, String orderStatus, String startTime, String endTime) {
         return list(Wrappers.<KwtLogisticsOrder>lambdaQuery()
                 .eq(KwtLogisticsOrder::getDelFlag,0)
                 .in(CollectionUtils.isNotEmpty(logOrderIds), KwtLogisticsOrder::getId, logOrderIds)
-                .in(CollectionUtils.isNotEmpty(allEnt), KwtLogisticsOrder::getEntId, allEnt)
                 .eq(Objects.nonNull(tradeOrderId),KwtLogisticsOrder::getTOrderId, tradeOrderId)
                 .eq(StringUtils.isNotBlank(orderStatus),KwtLogisticsOrder::getStatus, orderStatus)
                 .ge(StringUtils.isNotBlank(startTime),KwtLogisticsOrder::getLoadTime, startTime)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -2235,13 +2235,16 @@ public class KwtLogisticsConsignmentService {
         Set<Long> allEnt = getAllEnt(req.getEntId());
         //根据托运单位或者承运单位查询企业
         Set<Long> entList = getEntList(req);
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(allEnt)) {
+            entList.addAll(allEnt);
+        }
 
         //根据商品名称查询物流订单
-        Set<Long> logOrderIds = getLogOrderIds(req, entList);
+        Set<Long> logOrderIds = getLogOrderIds(req, entList,allEnt);
 
 
         //分页查询物流订单
-       IPage<KwtLogisticsOrder> page = logisticsOrderRepository.queryByPage(allEnt,logOrderIds,req.getTradeOrderId(), req.getOrderNo(),req.getOrderStatus(),
+       IPage<KwtLogisticsOrder> page = logisticsOrderRepository.queryByPage(logOrderIds,req.getTradeOrderId(), req.getOrderNo(),req.getOrderStatus(),
                req.getStartTime(), req.getEndTime(), req.getPageNum(), req.getPageSize());
         List<KwtLogisticsOrder> records = page.getRecords();
         if(org.springframework.util.CollectionUtils.isEmpty(records)){
@@ -2352,7 +2355,7 @@ public class KwtLogisticsConsignmentService {
     }
 
     @NotNull
-    private Set<Long> getLogOrderIds(QueryLogisticsOrderReq req, Set<Long> entList) {
+    private Set<Long> getLogOrderIds(QueryLogisticsOrderReq req, Set<Long> entList, Set<Long> allEnt) {
         Set<Long> logOrderIds = Sets.newHashSet();
         if (StringUtils.isNotBlank(req.getContractId())){
             List<KwtLogisticsOrderContract> kwtLogisticsOrderContracts = logisticsOrderContractRepository.queryByContractId(Long.parseLong(req.getContractId()));
@@ -2378,8 +2381,15 @@ public class KwtLogisticsConsignmentService {
             List<KwtLogisticsOrderUnit> logOrderUnits =logisticsOrderUnitRepository.queryByEntIds(entList);
             if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(logOrderUnits)){
                 //获取物流订单
+                Set<Long> logOrderIdList = logOrderUnits.stream()
+                        .filter(x -> allEnt.contains(x.getEntId()))
+                        .map(KwtLogisticsOrderUnit::getLOrderId)
+                        .collect(Collectors.toSet());
                 Set<Long> logOrderFormUnitIds =
-                        logOrderUnits.stream().map(KwtLogisticsOrderUnit::getLOrderId).collect(Collectors.toSet());
+                        logOrderUnits.stream()
+                                .filter(x->logOrderIdList.contains(x.getLOrderId()))
+                                .map(KwtLogisticsOrderUnit::getLOrderId)
+                                .collect(Collectors.toSet());
                 logOrderIds.addAll(logOrderFormUnitIds);
             }
         }
@@ -3029,6 +3039,10 @@ public class KwtLogisticsConsignmentService {
         Set<Long> allEnt = getAllEnt(req.getEntId());
         //根据托运单位或者承运单位查询企业
         Set<Long> entList = getEntList(req);
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(allEnt)){
+            entList.addAll(allEnt);
+        }
+
         if (!org.apache.commons.lang3.StringUtils.isAllBlank(req.getConsignCompanyId(),req.getCarriageCompanyId())
                 && org.apache.commons.collections4.CollectionUtils.isEmpty(entList)){
             Map<Integer, List<KwtLogisticsOrder>> statusAndLogOrdersMap = Maps.newHashMap() ;
@@ -3040,8 +3054,8 @@ public class KwtLogisticsConsignmentService {
         }
 
         //根据商品名称查询物流订单
-        Set<Long> logOrderIds = getLogOrderIds(req, entList);
-        List<KwtLogisticsOrder> logisticsOrders =logisticsOrderRepository.queryList(allEnt,logOrderIds,req.getTradeOrderId(), req.getOrderNo(),req.getOrderStatus(),
+        Set<Long> logOrderIds = getLogOrderIds(req, entList,allEnt);
+        List<KwtLogisticsOrder> logisticsOrders =logisticsOrderRepository.queryList(logOrderIds,req.getTradeOrderId(), req.getOrderNo(),req.getOrderStatus(),
                 req.getStartTime(), req.getEndTime());
 
         if (Objects.isNull(logisticsOrders)){