合同查询接口修改

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.contract.dao.KwcContractTradeMapper;
 import com.sckw.contract.model.entity.KwcContractTrade;
+import com.sckw.core.model.enums.ContractStatusEnum;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import org.apache.commons.collections4.CollectionUtils;
@@ -93,6 +94,13 @@ public class KwcContractTradeRepository extends ServiceImpl<KwcContractTradeMapp
                 .in(KwcContractTrade::getId, contractIdList));
     }
 
+    public List<KwcContractTrade> findSignedByContractIds(Set<Long> contractIdList) {
+        return list(Wrappers.<KwcContractTrade>lambdaQuery()
+                .eq(KwcContractTrade::getDelFlag, 0)
+                .eq(KwcContractTrade::getStatus, ContractStatusEnum.SIGNED.getCode())
+                .in(KwcContractTrade::getId, contractIdList));
+    }
+
     public List<KwcContractTrade> queryByEntId(Long entId) {
         return list(Wrappers.<KwcContractTrade>lambdaQuery()
                 .eq(KwcContractTrade::getEntId, entId)

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

@@ -2666,7 +2666,7 @@ public class KwcContractTradeService {
         log.debug("符合条件的已签约合同ID数量: {}", signedContractIds.size());
 
         // 7. 查询合同主表信息
-        List<KwcContractTrade> contractTrades = kwcContractTradeRepository.findByContractIds(signedContractIds);
+        List<KwcContractTrade> contractTrades = kwcContractTradeRepository.findSignedByContractIds(signedContractIds);
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractTrades)) {
             log.warn("根据合同ID查询合同主表信息为空，signedContractIds: {}", signedContractIds);
             return Collections.emptyList();
@@ -2686,7 +2686,7 @@ public class KwcContractTradeService {
                 .map(trade -> getContractTradeOrderInfo(
                         trade,
                         contractTradeUnitMap,
-                        contractTradeOrderDto.getEntType(),
+                        LoginUserHolder.getEntTypes(),
                         contractGoodsMap
                 ))
                 .collect(Collectors.toList());
@@ -2747,7 +2747,7 @@ public class KwcContractTradeService {
         }
 
         // 5. 根据已签约的合同ID集合，批量查询贸易合同主表信息
-        List<KwcContractTrade> kwcContractTrades = kwcContractTradeRepository.findByContractIds(signedContractIdList);
+        List<KwcContractTrade> kwcContractTrades = kwcContractTradeRepository.findSignedByContractIds(signedContractIdList);
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractTrades)) {
             log.warn("根据合同ID查询贸易合同主表信息为空，合同IDs: {}", signedContractIdList);
             return Collections.emptyList();