fix

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/RemoteContractService.java

@@ -144,7 +144,7 @@ public interface RemoteContractService {
     TradeContractGoodsDto queryContractGoodsByContractId(Long contractId, Long goodsId);
 
     List<TradeContractGoodsDto> queryContractGoodsByContractIds(Set<Long> contractIds, Set<Long> goodsIds);
-    Long queryTradeCount();
+    Long queryTradeCount(Long entId,Integer type);
     Long queryLogisticsCount(Long entId,Integer type);
     ContractCountVo contractCount();
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dao/KwcContractLogisticsMapper.java

@@ -52,7 +52,9 @@ public interface KwcContractLogisticsMapper extends BaseMapper<KwcContractLogist
 
     Long count(@Param("ids") List<Long> ids, @Param("entId") Long entId);
 
-    List<ContractVo> logisticsList(@Param("ids") List<Long> ids, @Param("all") Boolean all ,@Param("entId") Long entId);
+    List<ContractVo> logisticsList(@Param("ids") List<Long> ids, @Param("all") Boolean all, @Param("entId") Long entId);
+
+    Long selectSignCount(@Param("entId") Long entId, @Param("type") Integer type);
 }
 
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dao/KwcContractTradeMapper.java

@@ -72,6 +72,7 @@ public interface KwcContractTradeMapper extends BaseMapper<KwcContractTrade> {
 
     List<ContractVo> tradeList(@Param("ids") List<Long> ids, @Param("audit")Boolean audit, @Param("all") Boolean all);
 
+    Long selectSignCount(@Param("entId")Long entId,@Param("type") Integer type);
 }
 
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -13,10 +13,7 @@ import com.sckw.contract.dao.*;
 import com.sckw.contract.model.dto.res.QueryContractValidCountResDto;
 import com.sckw.contract.model.entity.*;
 import com.sckw.contract.model.vo.req.ContractDetailReq;
-import com.sckw.contract.model.vo.req.QueryListReqVo;
-import com.sckw.contract.model.vo.req.QueryLogisticListReq;
 import com.sckw.contract.model.vo.res.ContractDetailResp;
-import com.sckw.contract.model.vo.res.ContractStatusCountResp;
 import com.sckw.contract.model.vo.res.QueryLogisticDetailResp;
 import com.sckw.contract.repository.*;
 import com.sckw.contract.service.KwcContractLogisticsUnitService;
@@ -522,32 +519,14 @@ public class RemoteContractServiceImpl implements RemoteContractService {
     }
 
     @Override
-    public Long queryTradeCount() {
-        ContractStatusCountResp contractStatusCountResp = kwcContractTradeService.queryTradeContractStatusCount(new QueryListReqVo());
-
-        List<ContractStatusCountResp.ContractStatusCount> contractStatusInfo = contractStatusCountResp.getContractStatusInfo();
-        if (CollUtil.isEmpty(contractStatusInfo)) {
-            return 0L;
-        }
-        Optional<ContractStatusCountResp.ContractStatusCount> first = contractStatusInfo.stream().filter(d -> Objects.equals(d.getOrderStatus(), "1")).findFirst();
-        return first.map(contractStatusCount -> Long.parseLong(contractStatusCount.getOrderNum())).orElse(0L);
+    public Long queryTradeCount(Long entId, Integer type) {
+        return kwcContractTradeService.querySign(entId, type);
     }
 
     @Override
     public Long queryLogisticsCount(Long entId, Integer type) {
-        QueryLogisticListReq queryLogisticListReq = new QueryLogisticListReq();
-        if(Objects.equals(type,3)){
-            queryLogisticListReq.setCarriageCompanyId(String.valueOf(entId));
-        }else {
-            queryLogisticListReq.setConsignCompanyId(String.valueOf(entId));
-        }
-        ContractStatusCountResp contractStatusCountResp = kwcContractLogisticsService.queryLogisticContractStatusCount(queryLogisticListReq);
-        List<ContractStatusCountResp.ContractStatusCount> contractStatusInfo = contractStatusCountResp.getContractStatusInfo();
-        if (CollUtil.isEmpty(contractStatusInfo)) {
-            return 0L;
-        }
-        Optional<ContractStatusCountResp.ContractStatusCount> first = contractStatusInfo.stream().filter(d -> Objects.equals(d.getOrderStatus(), "1")).findFirst();
-        return first.map(contractStatusCount -> Long.parseLong(contractStatusCount.getOrderNum())).orElse(0L);
+        // type 买方或物流方
+        return kwcContractLogisticsMapper.selectSignCount(entId, type);
     }
 
     @Override

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

@@ -127,35 +127,51 @@ public class KwcContractTradeService {
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     private TransportRemoteService transportRemoteService;
 
-    /**销售合同*/
+    /**
+     * 销售合同
+     */
     @Value(value = "${jumpUrl.saleSendContract}")
     private String saleSendContract;
 
-    /**采购合同*/
+    /**
+     * 采购合同
+     */
     @Value(value = "${jumpUrl.purchaseSendContract}")
     private String purchaseSendContract;
 
-    /**托运合同*/
+    /**
+     * 托运合同
+     */
     @Value(value = "${jumpUrl.consignmentSendContract}")
     private String consignmentSendContract;
 
-    /**承运合同*/
+    /**
+     * 承运合同
+     */
     @Value(value = "${jumpUrl.acceptanceSendContract}")
     private String acceptanceSendContract;
 
-    /**app销售合同*/
+    /**
+     * app销售合同
+     */
     @Value(value = "${jumpUrl.appSaleSendContract}")
     private String appSaleSendContract;
 
-    /**app采购合同*/
+    /**
+     * app采购合同
+     */
     @Value(value = "${jumpUrl.appPurchaseSendContract}")
     private String appPurchaseSendContract;
 
-    /**app托运合同*/
+    /**
+     * app托运合同
+     */
     @Value(value = "${jumpUrl.appConsignmentSendContract}")
     private String appConsignmentSendContract;
 
-    /**app承运合同*/
+    /**
+     * app承运合同
+     */
     @Value(value = "${jumpUrl.appAcceptanceSendContract}")
     private String appAcceptanceSendContract;
 
@@ -192,8 +208,8 @@ public class KwcContractTradeService {
      * @author: czh
      * @date: 2023/7/18
      */
-    private List<QueryListResVo> getQueryListResVos(List<QueryListResDto> queryListResDtos,Map<Long,
-            List<KwcContractTradeGoods>> contractIdGoodsIdKeyAndGoodsMap,Map<String, KwcContractTradeUnit> contractUnitTypeKeyAndUnitMap ) {
+    private List<QueryListResVo> getQueryListResVos(List<QueryListResDto> queryListResDtos, Map<Long,
+            List<KwcContractTradeGoods>> contractIdGoodsIdKeyAndGoodsMap, Map<String, KwcContractTradeUnit> contractUnitTypeKeyAndUnitMap) {
         Map<Long, UserCacheResDto> longUserCacheResDtoMap = new HashMap<>(8);
         List<Long> initiateByList = queryListResDtos.stream().map(QueryListResDto::getInitiateBy).toList();
         if (CollectionUtils.isNotEmpty(initiateByList)) {
@@ -210,9 +226,9 @@ public class KwcContractTradeService {
                 queryListResVo.setProvideEntName(queryListResDto.getUnitType().compareTo(EntTypeEnum.SUPPLIER.getCode()) == 0 ? queryListResDto.getEntName() : queryListResDto.getTargetEntName());
                 queryListResVo.setPurchaseEntName(queryListResDto.getUnitType().compareTo(EntTypeEnum.SUPPLIER.getCode()) == 0 ? queryListResDto.getTargetEntName() : queryListResDto.getEntName());
             }
-            if(Objects.equals(queryListResDto.getUnitType(),EntTypeEnum.SUPPLIER.getCode())){
+            if (Objects.equals(queryListResDto.getUnitType(), EntTypeEnum.SUPPLIER.getCode())) {
                 queryListResVo.setProvideEntId(String.valueOf(queryListResDto.getProvideEntId()));
-            }else if(Objects.equals(queryListResDto.getUnitType(),EntTypeEnum.PURCHASER.getCode())){
+            } else if (Objects.equals(queryListResDto.getUnitType(), EntTypeEnum.PURCHASER.getCode())) {
                 queryListResVo.setPurchaseEntId(String.valueOf(queryListResDto.getPurchaseEntId()));
             }
 
@@ -221,7 +237,7 @@ public class KwcContractTradeService {
                 queryListResVo.setInitiateName(userCacheResDto.getName());
                 queryListResVo.setInitiateEntName(Objects.isNull(userCacheResDto.getEntInfo()) ? "" : userCacheResDto.getEntInfo().getFirmName());
             }
-            if (MapUtils.isNotEmpty(contractUnitTypeKeyAndUnitMap)){
+            if (MapUtils.isNotEmpty(contractUnitTypeKeyAndUnitMap)) {
                 KwcContractTradeUnit kwcContractTradeUnit =
                         contractUnitTypeKeyAndUnitMap.getOrDefault(queryListResDto.getId() + "-" + EntTypeEnum.SUPPLIER.getCode()
                                 , new KwcContractTradeUnit());
@@ -244,9 +260,9 @@ public class KwcContractTradeService {
             queryListResVo.setAmount(queryListResDto.getAmount());
             queryListResVo.setPerformedAmount(queryListResDto.getPerformedAmount());
             BigDecimal performedAmountMoney = BigDecimal.ZERO;
-            if(MapUtils.isNotEmpty(contractIdGoodsIdKeyAndGoodsMap)) {
+            if (MapUtils.isNotEmpty(contractIdGoodsIdKeyAndGoodsMap)) {
                 List<KwcContractTradeGoods> contractTradeGoods = contractIdGoodsIdKeyAndGoodsMap.get(queryListResDto.getId());
-                if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(contractTradeGoods)){
+                if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(contractTradeGoods)) {
                     for (KwcContractTradeGoods goods : contractTradeGoods) {
                         BigDecimal performedAmount = goods.getPerformedAmount() != null ? goods.getPerformedAmount() : BigDecimal.ZERO;
                         BigDecimal price = goods.getPrice() != null ? goods.getPrice() : BigDecimal.ZERO;
@@ -254,11 +270,11 @@ public class KwcContractTradeService {
                     }
                 }
             }
-            queryListResVo.setPerformedAmountMoney( performedAmountMoney);
-            if(Objects.nonNull(queryListResVo.getEndTime())) {
+            queryListResVo.setPerformedAmountMoney(performedAmountMoney);
+            if (Objects.nonNull(queryListResVo.getEndTime())) {
                 queryListResVo.setEndTime(DateUtils.getStartOfDay(queryListResVo.getEndTime()));
                 String endDate = DateUtils.format(queryListResVo.getEndTime(), DateUtils.DATE_PATTERN);
-                if (org.apache.commons.lang3.StringUtils.equals(endDate,"9999-12-30")){
+                if (org.apache.commons.lang3.StringUtils.equals(endDate, "9999-12-30")) {
                     queryListResVo.setEndTime(null);
                 }
             }
@@ -287,9 +303,9 @@ public class KwcContractTradeService {
         kwcContractTrade.setId(contactId);
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntTreeById(LoginUserHolder.getEntId());
         if (Objects.nonNull(entCacheResDto) && StringUtils.isNotBlank(entCacheResDto.getEntTypes())) {
-            if (org.apache.commons.lang3.StringUtils.equals(entCacheResDto.getEntTypes(), String.valueOf(EntTypeEnum.SUPPLIER.getCode()))){
+            if (org.apache.commons.lang3.StringUtils.equals(entCacheResDto.getEntTypes(), String.valueOf(EntTypeEnum.SUPPLIER.getCode()))) {
                 kwcContractTrade.setStatus(ContractStatusEnum.WAIT_APPROVE.getCode());
-            }else if (org.apache.commons.lang3.StringUtils.equals(entCacheResDto.getEntTypes(), String.valueOf(EntTypeEnum.PURCHASER.getCode()))){
+            } else if (org.apache.commons.lang3.StringUtils.equals(entCacheResDto.getEntTypes(), String.valueOf(EntTypeEnum.PURCHASER.getCode()))) {
                 kwcContractTrade.setStatus(ContractStatusEnum.SUBMIT.getCode());
             }
         }
@@ -300,7 +316,7 @@ public class KwcContractTradeService {
         }
 
         //保存交易合同商品信息
-        kwcContractTradeGoodsService.saveContractTradeGoods(contactId, goodsInfoList,baseInfo.getStartTime(),baseInfo.getEndTime());
+        kwcContractTradeGoodsService.saveContractTradeGoods(contactId, goodsInfoList, baseInfo.getStartTime(), baseInfo.getEndTime());
 
         //存单位信息
         kwcContractTradeUnitService.saveContractTradeUnit(contactId, baseInfo);
@@ -367,6 +383,7 @@ public class KwcContractTradeService {
 
     /**
      * 校验供应单位必须在贸易合同生效期内,且有包含该商品的自动派车的物流合同
+     *
      * @param baseInfo
      * @param goodsInfo
      */
@@ -422,7 +439,7 @@ public class KwcContractTradeService {
         kwcContractTrade.setStartTime(baseInfo.getStartTime());
         if (Objects.nonNull(baseInfo.getEndTime())) {
             kwcContractTrade.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
-        }else {
+        } else {
             LocalDate localDate = LocalDate.of(9999, 12, 30);
             Date date1 = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
             kwcContractTrade.setEndTime(DateUtils.getEndOfDay(date1));
@@ -718,12 +735,11 @@ public class KwcContractTradeService {
                     purchaseSendContract,
                     appPurchaseSendContract);
         } catch (Exception e) {
-           log.error("合同签约流程已发起消息出错：", e);
+            log.error("合同签约流程已发起消息出错：", e);
         }
     }
 
 
-
     /**
      * @param id 合同id
      * @desc: 更新合同为发起
@@ -758,7 +774,7 @@ public class KwcContractTradeService {
         EntTypeResDto entTypeResDto = remoteSystemService.queryEntTypeById(LoginUserHolder.getEntId());
 
         TradeBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
-        if (Objects.equals(baseInfo.getUnloadWay(), Integer.parseInt(DictEnum.LOAD_UNLOAD_WAY_2.getValue())) && Objects.isNull(baseInfo.getMeasurementWay())){
+        if (Objects.equals(baseInfo.getUnloadWay(), Integer.parseInt(DictEnum.LOAD_UNLOAD_WAY_2.getValue())) && Objects.isNull(baseInfo.getMeasurementWay())) {
             throw new BusinessException("卸货方式为按卸货筽量时，计量方式不能为空！");
         }
         kwcContractTrade.setEntId(LoginUserHolder.getEntId());
@@ -790,9 +806,9 @@ public class KwcContractTradeService {
                 }
             }
         }
-        if (Objects.nonNull(entTypeResDto) && Objects.equals(entTypeResDto.getType(), EntTypeEnum.SUPPLIER.getCode())){
+        if (Objects.nonNull(entTypeResDto) && Objects.equals(entTypeResDto.getType(), EntTypeEnum.SUPPLIER.getCode())) {
             kwcContractTrade.setStatus(ContractStatusEnum.WAIT_APPROVE.getCode());
-        }else if (Objects.nonNull(entTypeResDto) && Objects.equals(entTypeResDto.getType(), EntTypeEnum.PURCHASER.getCode())){
+        } else if (Objects.nonNull(entTypeResDto) && Objects.equals(entTypeResDto.getType(), EntTypeEnum.PURCHASER.getCode())) {
             kwcContractTrade.setStatus(ContractStatusEnum.SUBMIT.getCode());
         }
         kwcContractTrade.setAmount(amountTotal);
@@ -977,7 +993,7 @@ public class KwcContractTradeService {
         if (CollectionUtils.isEmpty(queryListResDtos)) {
             return Collections.emptyList();
         }
-        return getQueryListResVos(queryListResDtos,null,null);
+        return getQueryListResVos(queryListResDtos, null, null);
     }
 
 
@@ -1073,7 +1089,7 @@ public class KwcContractTradeService {
             authEntIdList.addAll(ids);
         }
 
-        List<QueryListResDto> queryListResDtos = kwcContractTradeMapper.queryTradeList(reqVo,authEntIdList);
+        List<QueryListResDto> queryListResDtos = kwcContractTradeMapper.queryTradeList(reqVo, authEntIdList);
         if (CollectionUtils.isEmpty(queryListResDtos)) {
             return PageHelperUtil.getPageResult(new PageInfo<>());
         }
@@ -1337,9 +1353,9 @@ public class KwcContractTradeService {
 
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntTreeById(LoginUserHolder.getEntId());
         if (Objects.nonNull(entCacheResDto) && StringUtils.isNotBlank(entCacheResDto.getEntTypes())) {
-            if (org.apache.commons.lang3.StringUtils.equals(entCacheResDto.getEntTypes(), String.valueOf(EntTypeEnum.SUPPLIER.getCode()))){
+            if (org.apache.commons.lang3.StringUtils.equals(entCacheResDto.getEntTypes(), String.valueOf(EntTypeEnum.SUPPLIER.getCode()))) {
                 kwcContractTrade.setStatus(ContractStatusEnum.WAIT_APPROVE.getCode());
-            }else if (org.apache.commons.lang3.StringUtils.equals(entCacheResDto.getEntTypes(), String.valueOf(EntTypeEnum.PURCHASER.getCode()))){
+            } else if (org.apache.commons.lang3.StringUtils.equals(entCacheResDto.getEntTypes(), String.valueOf(EntTypeEnum.PURCHASER.getCode()))) {
                 kwcContractTrade.setStatus(ContractStatusEnum.SUBMIT.getCode());
             }
         }
@@ -1571,8 +1587,8 @@ public class KwcContractTradeService {
                 String.valueOf(kwcContractTrade.getUnloadWay())));
         tradeBaseInfo.setSalesmanId(kwcContractTrade.getSalesmanId());
         tradeBaseInfo.setSalesmanPhone(kwcContractTrade.getSalesmanPhone());
-        tradeBaseInfo.setMeasurementWay(Objects.equals(kwcContractTrade.getMeasurementWay(),-1) ? null:kwcContractTrade.getMeasurementWay());
-        tradeBaseInfo.setMeasurementWayDesc(Objects.equals(kwcContractTrade.getMeasurementWay(),-1) ? "" : DictEnum.getLabel(String.valueOf(kwcContractTrade.getMeasurementWay())));
+        tradeBaseInfo.setMeasurementWay(Objects.equals(kwcContractTrade.getMeasurementWay(), -1) ? null : kwcContractTrade.getMeasurementWay());
+        tradeBaseInfo.setMeasurementWayDesc(Objects.equals(kwcContractTrade.getMeasurementWay(), -1) ? "" : DictEnum.getLabel(String.valueOf(kwcContractTrade.getMeasurementWay())));
         tradeBaseInfo.setDispatchWay(kwcContractTrade.getDispatchWay());
         tradeBaseInfo.setDispatchWayDesc(Optional.ofNullable(kwcContractTrade.getDispatchWay()).map(DispatchWayEnums::getDesc).orElse(""));
         return tradeBaseInfo;
@@ -1586,7 +1602,7 @@ public class KwcContractTradeService {
         } else {
             entId = LoginUserHolder.getEntId();
         }
-       // Integer type = null;
+        // Integer type = null;
         Set<Long> entIds = Sets.newHashSet();
         entIds.add(entId);
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getPurchaseEntId())) {
@@ -1879,7 +1895,7 @@ public class KwcContractTradeService {
         Date date = new Date();
         logistics = logistics.stream()
                 .peek(log -> {
-                    if (Objects.isNull(log.getEndTime())){
+                    if (Objects.isNull(log.getEndTime())) {
                         LocalDate localDate = LocalDate.of(9999, 12, 30);
                         Date date1 = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
                         log.setEndTime(date1);
@@ -1944,21 +1960,21 @@ public class KwcContractTradeService {
         //查询贸易合同企业信息
         List<KwcContractTradeUnit> tradeUnits = kwcContractTradeUnitRepository.queryByEntIdAndUnitType(contractTradeOrderDto.getEntId(),
                 contractTradeOrderDto.getEntType());
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(tradeUnits)){
-            return  List.of();
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(tradeUnits)) {
+            return List.of();
         }
         Set<Long> contractIds =
                 tradeUnits.stream().map(KwcContractTradeUnit::getContractId).collect(Collectors.toSet());
 
         List<KwcContractTradeUnit> tradeUnits1 = kwcContractTradeUnitRepository.queryByContractIds(contractIds);
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(tradeUnits1)){
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(tradeUnits1)) {
             return List.of();
         }
         Map<String, KwcContractTradeUnit> conTractTradeUnitMap =
                 tradeUnits1.stream().collect(Collectors.toMap(x -> x.getContractId() +
                                 "_" + x.getUnitType(), Function.identity(),
                         (x, y) -> x));
-        contractIds= tradeUnits1.stream()
+        contractIds = tradeUnits1.stream()
                 .filter(x -> Objects.equals(x.getEntId(), LoginUserHolder.getEntId()) && Objects.equals(x.getUnitType(),
                         2))
                 .map(KwcContractTradeUnit::getContractId)
@@ -1970,7 +1986,7 @@ public class KwcContractTradeService {
             return Collections.emptyList();
         }
         Map<Long, KwcContractTradeGoods> contractGoodsMap = kwcContractGoods.stream()
-                .collect(Collectors.toMap(KwcContractTradeGoods::getContractId,Function.identity(),(x,y)->x));
+                .collect(Collectors.toMap(KwcContractTradeGoods::getContractId, Function.identity(), (x, y) -> x));
         //只查询已签约的
         Set<Long> contractIdList = kwcContractGoods.stream()
                 .filter(x -> Objects.equals(x.getStatus(), ContractStatusEnum.SIGNED.getCode()))
@@ -1982,15 +1998,15 @@ public class KwcContractTradeService {
             return Collections.emptyList();
         }
         kwcContractTrades = kwcContractTrades.stream()
-                .filter(x-> Objects.equals(x.getStatus(), ContractStatusEnum.SIGNED.getCode()))
+                .filter(x -> Objects.equals(x.getStatus(), ContractStatusEnum.SIGNED.getCode()))
                 .collect(Collectors.toList());
         return kwcContractTrades.stream()
-                .map(x-> getContractTradeOrderInfo(x, conTractTradeUnitMap,contractTradeOrderDto.getEntType(),contractGoodsMap))
+                .map(x -> getContractTradeOrderInfo(x, conTractTradeUnitMap, contractTradeOrderDto.getEntType(), contractGoodsMap))
                 .collect(Collectors.toList());
     }
 
     private static void checkParam(Long contractTradeOrderDto, Long contractTradeOrderDto1, Integer contractTradeOrderDto2) {
-        if (Objects.isNull(contractTradeOrderDto) && Objects.equals(contractTradeOrderDto2,1)) {
+        if (Objects.isNull(contractTradeOrderDto) && Objects.equals(contractTradeOrderDto2, 1)) {
             throw new BusinessException("商品id不能为空！");
         }
         if (Objects.isNull(contractTradeOrderDto1)) {
@@ -2003,7 +2019,7 @@ public class KwcContractTradeService {
 
     @NotNull
     private static ContractTradeOrderInfo getContractTradeOrderInfo(KwcContractTrade c, Map<String,
-            KwcContractTradeUnit> conTractTradeUnitMap,Integer entType, Map<Long, KwcContractTradeGoods> contractGoodsMap) {
+            KwcContractTradeUnit> conTractTradeUnitMap, Integer entType, Map<Long, KwcContractTradeGoods> contractGoodsMap) {
         ContractTradeOrderInfo contractTradeOrderInfo = new ContractTradeOrderInfo();
         contractTradeOrderInfo.setId(c.getId());
         KwcContractTradeUnit unit = conTractTradeUnitMap.getOrDefault(c.getId() + "_" + entType,
@@ -2035,7 +2051,7 @@ public class KwcContractTradeService {
         contractTradeOrderInfo.setSalesmanId(c.getSalesmanId());
         contractTradeOrderInfo.setSalesmanPhone(c.getSalesmanPhone());
         KwcContractTradeGoods kwcContractTradeGoods = contractGoodsMap.getOrDefault(c.getId(), new KwcContractTradeGoods());
-        contractTradeOrderInfo.setSignPrice(Objects.nonNull(kwcContractTradeGoods.getPrice())?kwcContractTradeGoods.getPrice():new BigDecimal("-1"));
+        contractTradeOrderInfo.setSignPrice(Objects.nonNull(kwcContractTradeGoods.getPrice()) ? kwcContractTradeGoods.getPrice() : new BigDecimal("-1"));
         contractTradeOrderInfo.setAmount(Objects.isNull(kwcContractTradeGoods.getAmount()) ? new BigDecimal("-1") : kwcContractTradeGoods.getAmount());
         return contractTradeOrderInfo;
     }
@@ -2054,17 +2070,17 @@ public class KwcContractTradeService {
         } else {
             entId = LoginUserHolder.getEntId();
         }
-       // Integer type =null;
+        // 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();
+            // type=CooperateTypeEnum.PURCHASER.getCode();
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getSupplyEntId())) {
             entIds.add(Long.valueOf(req.getSupplyEntId()));
-           // type=CooperateTypeEnum.SUPPLIER.getCode();
+            // type=CooperateTypeEnum.SUPPLIER.getCode();
         }
         Set<Long> contractIds = null;
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIds)) {
@@ -2182,12 +2198,13 @@ public class KwcContractTradeService {
 
     /**
      * 查询同产品和同托运企业是否存在自动派车合同
-     * @param entId 托运企业
+     *
+     * @param entId    托运企业
      * @param goodsIds 商品id集合
      * @return
      */
     public List<LogisticsEntDtoVO> queryAutoContractLogOrder(Long entId, List<Long> goodsIds) {
-        log.info("查询满足贸易合合同供应企业和商品的自动派车的物流合同，企业id：{}, 商品id：{}",entId, JSON.toJSONString(goodsIds));
+        log.info("查询满足贸易合合同供应企业和商品的自动派车的物流合同，企业id：{}, 商品id：{}", entId, JSON.toJSONString(goodsIds));
         if (Objects.isNull(entId)) {
             throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "供应商企业id不能为空！");
         }
@@ -2261,6 +2278,7 @@ public class KwcContractTradeService {
 
     /**
      * 参数转换
+     *
      * @param contractLogisticsList
      * @return
      */
@@ -2294,12 +2312,13 @@ public class KwcContractTradeService {
 
     /**
      * 查询同产品和同托运企业是否存在手动派车合同
-     * @param entId 托运企业
+     *
+     * @param entId   托运企业
      * @param goodsId 商品id集合
      * @return
      */
     public List<LogisticsEntDtoVO> queryContractLogOrder(Long entId, Long goodsId) {
-        log.info("查询满足贸易合合同供应企业和商品的手动派车的物流合同，企业id：{}, 商品id：{}",entId, goodsId);
+        log.info("查询满足贸易合合同供应企业和商品的手动派车的物流合同，企业id：{}, 商品id：{}", entId, goodsId);
         if (Objects.isNull(entId)) {
             throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "供应商企业id不能为空！");
         }
@@ -2374,8 +2393,9 @@ public class KwcContractTradeService {
 
     /**
      * 根据合同id和商品id查询物流合同商品信息
+     *
      * @param contractId 物流合同
-     * @param goodsId 商品id
+     * @param goodsId    商品id
      * @return
      */
     public LogisticsGoodsDto queryLogGoodsByContractId(Long contractId, Long goodsId) {
@@ -2398,7 +2418,6 @@ public class KwcContractTradeService {
     }
 
 
-
     //查询物流合同物流企业信息
     public TradeContractUnitDto queryEntByContractId(Long contractId) {
         KwcContractLogisticsUnit unit = kwcContractLogisticsUnitRepository.queryByLogContractIdUnit(contractId);
@@ -2425,5 +2444,8 @@ public class KwcContractTradeService {
         return logisticsScore;
     }
 
+    public Long querySign(Long entId, Integer type) {
+        return kwcContractTradeMapper.selectSignCount(entId, type);
+    }
 }
 

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractLogisticsMapper.xml

@@ -227,4 +227,16 @@
             </if>
         </where>
     </select>
+
+    <select id="selectSignCount" resultType="java.lang.Long">
+        SELECT count(distinct a.id)
+        FROM kwc_contract_logistics a
+                 LEFT JOIN kwc_contract_logistics_unit b ON a.id = b.contract_id and b.del_flag = 0 and b.unit_type = 3
+                 LEFT JOIN kwc_contract_logistics_unit d ON a.id = d.contract_id and d.del_flag = 0 and d.unit_type = 4
+        <where>
+            a.del_flag = 0
+              and a.status = 1
+              and (d.ent_id = #{entId} or b.ent_id = #{entId})
+        </where>
+    </select>
 </mapper>

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -393,4 +393,18 @@
             </if>
         </where>
     </select>
+
+    <select id="selectSignCount" resultType="java.lang.Long">
+        select count(a.id)
+        from kwc_contract_trade a
+                 left join kwc_contract_trade_unit c on a.id = c.contract_id and c.del_flag = 0 and c.unit_type = 1
+                 left join kwc_contract_trade_unit d on a.id = d.contract_id and d.del_flag = 0 and d.unit_type = 2
+        <where>
+            a.del_flag = 0
+            and a.status =1
+            <if test="entId != null">
+                and d.ent_id = #{entId}
+            </if>
+        </where>
+    </select>
 </mapper>

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteBaseService.java

@@ -172,6 +172,15 @@ public class RemoteBaseService {
         return kwsEntDeptDao.selectByEntPidList(entIds);
     }
 
+    public Integer queryEntType(Long entId) {
+        List<KwsEntType> list = kwsEntTypeDao.findListByEntId(entId);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+
+        return list.get(0).getType();
+    }
+
     public List<EntTypeResDto> queryEntTypeById(Long entId) {
         List<KwsEntType> list = kwsEntTypeDao.findListByEntId(entId);
         if (CollectionUtils.isEmpty(list)) {

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -3,7 +3,6 @@ package com.sckw.system.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import com.mysql.cj.x.protobuf.MysqlxDatatypes;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
@@ -75,6 +74,7 @@ public class KwsMenuService {
 
     @Autowired
     private RemoteBaseService remoteBaseService;
+
     /**
      * @param params 实体
      * @desc: 添加新纪录
@@ -615,7 +615,12 @@ public class KwsMenuService {
                 if (CollUtil.isNotEmpty(children)) {
                     for (FindMenuTreeResVo child : children) {
                         if (StrUtil.equals(child.getName(), "贸易合同") && hasPerm(child.getChildren(), "tradeContract:sign")) {
-                            Long aLong = remoteContractService.queryTradeCount();
+                            Long entId = LoginUserHolder.getEntId();
+                            Integer entType = remoteBaseService.queryEntType(entId);
+                            Long aLong = remoteContractService.queryTradeCount(entId, entType);
+                            if (Objects.isNull(aLong)) {
+                                aLong = 0L;
+                            }
                             child.setCount(aLong);
                             sum = sum + aLong;
                             total = total + aLong;
@@ -623,14 +628,10 @@ public class KwsMenuService {
                         }
                         if (StrUtil.equals(child.getName(), "物流合同") && hasPerm(child.getChildren(), "logisticsContract:sign")) {
                             Long entId = LoginUserHolder.getEntId();
-                            Long aLong = 0L;
-                            List<EntTypeResDto> entTypeResDtoList = remoteBaseService.queryEntTypeById(entId);
-                            if (CollectionUtils.isNotEmpty(entTypeResDtoList)) {
-                                EntTypeResDto entTypeResDto = entTypeResDtoList.get(0);
-                                Integer type = entTypeResDto.getType();
-                                if (Objects.nonNull(type) && !Objects.equals(type, 1)) {
-                                    aLong = remoteContractService.queryLogisticsCount(entId, type);
-                                }
+                            Integer entType = remoteBaseService.queryEntType(entId);
+                            Long aLong = remoteContractService.queryLogisticsCount(entId, entType);
+                            if (Objects.isNull(aLong)) {
+                                aLong = 0L;
                             }
                             child.setCount(aLong);
                             sum = sum + aLong;