1、运需及求购接口调整；

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/WantBuySelectParam.java

@@ -80,4 +80,9 @@ public class WantBuySelectParam extends PageRequest {
 
     private List<Long> wantBuyIds;
 
+    /**
+     * 系统类型
+     */
+    private Integer systemType;
+
 }

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

@@ -31,6 +31,7 @@ import com.sckw.system.api.model.dto.res.SysDictResDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.data.mongodb.core.aggregation.ArrayOperators;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -216,9 +217,14 @@ public class KwoTransportDemandService {
      * @return: com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<com.sckw.order.model.KwoTransportDemand>
      */
     private LambdaQueryWrapper<KwoTransportDemand> buildWrapper(ExportTransportDemandParam param) {
-        Long entId = LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null;
+        Long entId = !Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode()) ? LoginUserHolder.getEntId() : null;
         LambdaQueryWrapper<KwoTransportDemand> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwoTransportDemand::getEntId, entId).eq(KwoTransportDemand::getDelFlag, Global.NO);
+        wrapper.eq(KwoTransportDemand::getDelFlag, Global.NO);
+        if (!Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode())) {
+            wrapper.eq(KwoTransportDemand::getEntId, entId);
+        } else {
+            wrapper.in(KwoTransportDemand::getStatus, 1 , 2);
+        }
         if (StringUtils.isNotBlank(param.getIds())) {
             List<Long> ids = StringUtils.splitStrToList(param.getIds(), ",", Long.class);
             wrapper.in(KwoTransportDemand::getId, ids).orderByDesc(KwoTransportDemand::getCreateTime);
@@ -265,19 +271,27 @@ public class KwoTransportDemandService {
         LambdaQueryWrapper<KwoTransportDemand> wrapper = buildWrapper(BeanUtils.copyProperties(param, ExportTransportDemandParam.class));
         List<KwoTransportDemand> demands = kwoTransportDemandMapper.selectList(wrapper);
         Map<Integer, List<KwoTransportDemand>> map = demands.stream().collect(Collectors.groupingBy(KwoTransportDemand::getStatus));
+
         List<TableTop> tableTops = new ArrayList<>();
         TableTop all = new TableTop();
         all.setName("全部").setTotal(CollectionUtils.isEmpty(demands) ? 0 : demands.size());
         tableTops.add(all);
+
         List<DictEnum> enums = DictEnum.getEnumsByType(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
         enums.forEach(e -> {
             Integer value = Integer.valueOf(e.getValue());
+            Integer systemType = LoginUserHolder.getSystemType();
+            if (Objects.equals(systemType, SystemTypeEnum.MANAGE.getCode()) && Objects.equals(value, Global.NO)) {
+                return;
+            }
             List<KwoTransportDemand> list = map.get(value);
             int total = CollectionUtils.isEmpty(list) ? 0 : list.size();
             TableTop tableTop = new TableTop();
             tableTop.setName(e.getLabel()).setValue(value).setTotal(total);
             tableTops.add(tableTop);
+
         });
+
         TableBottom tableBottom = new TableBottom();
         tableBottom.setTotal(CollectionUtils.isEmpty(demands) ? 0 : demands.size());
         res.setTableTops(tableTops).setTableBottom(tableBottom);

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

@@ -136,13 +136,14 @@ public class KwpWantBuyService {
             List<String> longList = stringToLongList(wantBuySelectParam.getTrading());
             wantBuySelectParam.setTradings(longList);
         }
-
         //商品分类筛选处理
         if (StringUtils.isNotBlank(wantBuySelectParam.getGoodsType()) && StringUtils.isNotBlank(wantBuySelectParam.getGoodsTypeValue())) {
             List<String> goodsTypes = goodsTypeHandle(wantBuySelectParam);
             wantBuySelectParam.setGoodsTypeValueSearch(goodsTypes);
         }
         wantBuySelectParam.setEntId(LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
+        wantBuySelectParam.setSystemType(LoginUserHolder.getSystemType());
+
         PageHelper.startPage(wantBuySelectParam.getPage(), wantBuySelectParam.getPageSize());
         List<WantBuySelectRes> wantBuyDto = kwpWantBuyMapper.pageSelect(wantBuySelectParam);
         if (CollectionUtils.isEmpty(wantBuyDto)) {
@@ -444,7 +445,9 @@ public class KwpWantBuyService {
             List<String> goodsTypes = goodsTypeHandle(params);
             params.setGoodsTypeValueSearch(goodsTypes);
         }
-        params.setEntId(LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
+        params.setEntId(!Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode()) ? LoginUserHolder.getEntId() : null);
+        params.setSystemType(LoginUserHolder.getSystemType());
+
         List<WantBuySelectRes> result = kwpWantBuyMapper.pageSelect(params);
         Map<Integer, List<WantBuySelectRes>> map = result.stream().collect(Collectors.groupingBy(WantBuySelectRes::getStatus));
         List<TableTop> tableTops = new ArrayList<>();
@@ -454,6 +457,10 @@ public class KwpWantBuyService {
         List<DictEnum> enums = DictEnum.getEnumsByType(DictTypeEnum.WANT_BUY_STATUS.getType());
         enums.forEach(e -> {
             Integer value = Integer.valueOf(e.getValue());
+            Integer systemType = LoginUserHolder.getSystemType();
+            if (Objects.equals(systemType, SystemTypeEnum.MANAGE.getCode()) && Objects.equals(value, Global.NO)) {
+                return;
+            }
             List<WantBuySelectRes> list = map.get(value);
             int total = CollectionUtils.isEmpty(list) ? 0 : list.size();
             TableTop tableTop = new TableTop();
@@ -484,6 +491,8 @@ public class KwpWantBuyService {
             }
         }
         selectParam.setEntId(LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
+        selectParam.setSystemType(LoginUserHolder.getSystemType());
+
         List<WantBuySelectRes> wantBuyDto = kwpWantBuyMapper.pageSelect(selectParam);
         if (CollectionUtils.isEmpty(wantBuyDto)) {
             return Collections.emptyList();

sckw-modules/sckw-order/src/main/resources/mapper/KwoWantBuyMapper.xml

@@ -90,6 +90,10 @@
         <if test="wantBuyReq.cityCode != null and wantBuyReq.cityCode != ''">
             and (kba.`city_code` like concat(#{wantBuyReq.cityCode,jdbcType=VARCHAR}, '%'))
         </if>
+        <if test="wantBuyReq.systemType != null and wantBuyReq.systemType == 1">
+            and kb.status in (1,2)
+        </if>
+
     </sql>
 
     <select id="pageSelect" resultMap="wangBuyResultMap" resultType="com.sckw.order.model.vo.res.WantBuySelectRes">