Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-order/src/main/java/com/sckw/order/dubbo/TradeOrderInfoServiceImpl.java

@@ -270,7 +270,12 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
 
     @Override
     public Boolean associateEnt(Long entId) {
-        return tradeOrderUnitService.associateEnt(entId);
+        List<Long> tOrderIds = tradeOrderUnitService.associateEntOrderId(entId);
+        if (CollectionUtils.isEmpty(tOrderIds)){
+            return Boolean.FALSE;
+        }
+        List<KwoTradeOrder> list = kwoTradeOrderService.associateEnt(tOrderIds);
+        return CollectionUtils.isNotEmpty(list);
     }
 
     /**

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

@@ -945,4 +945,19 @@ public class KwoTradeOrderService {
         res.setLoadAddressList(loadTree).setUnloadAddressList(unloadTree);
         return res;
     }
+
+    /**
+     * @desc: 根据ids获取进行中的订单
+     * @author: yzc
+     * @date: 2023-08-17 17:34
+     * @Param tOrderIds:
+     * @return: java.util.List<com.sckw.order.model.KwoTradeOrder>
+     */
+    public List<KwoTradeOrder> associateEnt(List<Long> tOrderIds) {
+        LambdaQueryWrapper<KwoTradeOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(KwoTradeOrder::getId, tOrderIds).eq(KwoTradeOrder::getDelFlag, Global.NO)
+                .in(KwoTradeOrder::getStatus, 1, 2, 3, 4);
+        List<KwoTradeOrder> list = kwoTradeOrderMapper.selectList(wrapper);
+        return CollectionUtils.emptyIfNull(list);
+    }
 }

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

@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -134,10 +135,14 @@ public class KwoTradeOrderUnitService {
      * @Param entId:
      * @return: java.lang.Boolean
      */
-    public Boolean associateEnt(Long entId) {
+    public List<Long> associateEntOrderId(Long entId) {
         LambdaQueryWrapper<KwoTradeOrderUnit> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwoTradeOrderUnit::getEntId, entId).eq(KwoTradeOrderUnit::getDelFlag, Global.NO);
         Long count = kwoTradeOrderUnitMapper.selectCount(wrapper);
-        return Objects.nonNull(count) && count > 0L;
+        List<KwoTradeOrderUnit> list = kwoTradeOrderUnitMapper.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(KwoTradeOrderUnit::getTOrderId).distinct().toList();
     }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/pojo/FindPojoParam.java

@@ -63,4 +63,9 @@ public class FindPojoParam extends PageRequest {
      */
     private Integer entDept;
 
+    /**
+     * 企业id
+     */
+    private Long entId;
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EntFindPageReqVo.java

@@ -89,4 +89,9 @@ public class EntFindPageReqVo extends PageRequest implements Serializable {
      */
     private Integer entDept;
 
+    /**
+     * 企业id
+     */
+    private Long entId;
+
 }

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -92,8 +92,7 @@
     from kws_enterprise a
     left join kws_user k on a.create_by = k.id
     left join kws_user ku on a.update_by = ku.id
-    left join kws_ent_type b
-    on a.id = b.ent_id
+    left join kws_ent_type b on a.id = b.ent_id
     <if test="dto.typeList != null and dto.typeList.size() > 0">and b.type in
       <foreach collection="dto.typeList" item="item" open="(" close=")" separator=",">
         #{item}
@@ -104,6 +103,9 @@
     <if test="dto.approval != null">
       and a.approval = #{dto.approval}
     </if>
+    <if test="dto.entId != null">
+      and a.id = #{dto.entId}
+    </if>
     <if test="dto.keywords != null">
       and (a.contacts like concat('%', #{dto.keywords}, '%') or a.phone like concat('%', #{dto.keywords}, '%') or a.firm_name like concat('%', #{dto.keywords}, '%'))
     </if>