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

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

@@ -711,6 +711,8 @@ public class KwcContractTradeService {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
         }
 
+        EntTypeResDto entTypeResDto = remoteSystemService.queryEntTypeById(LoginUserHolder.getEntId());
+
         TradeBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
         kwcContractTrade.setEntId(LoginUserHolder.getEntId());
         kwcContractTrade.setContractNo(baseInfo.getContractCode());
@@ -740,6 +742,11 @@ public class KwcContractTradeService {
                 }
             }
         }
+        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())){
+            kwcContractTrade.setStatus(ContractStatusEnum.SUBMIT.getCode());
+        }
         kwcContractTrade.setAmount(amountTotal);
         kwcContractTrade.setSigningUrl(reqVo.getContractFile());
         kwcContractTrade.setUpdateBy(LoginUserHolder.getUserId());

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/EntFindPageResVo.java

@@ -143,7 +143,7 @@ public class EntFindPageResVo implements Serializable {
     /**
      * 母企业名
      */
-    private String pEntName;
+    private String pentName;
 
     private String ent1;
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/KwsEnterpriseRepository.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.core.model.base.BaseModel;
+import com.sckw.core.model.enums.ApprovalEnum;
 import com.sckw.system.dao.KwsEnterpriseDao;
 import com.sckw.system.model.KwsEnterprise;
 
@@ -31,6 +32,7 @@ public class KwsEnterpriseRepository extends ServiceImpl<KwsEnterpriseDao,KwsEnt
         return list(Wrappers.<KwsEnterprise>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
                 .eq(BaseModel::getStatus, 0)
+                .eq(KwsEnterprise::getApproval, ApprovalEnum.OK.getCode())
                 .eq(StringUtils.isNotBlank(entId), KwsEnterprise::getId, entId)
                 .like(StringUtils.isNotBlank(entName), KwsEnterprise::getFirmName, entName));
     }
@@ -39,6 +41,7 @@ public class KwsEnterpriseRepository extends ServiceImpl<KwsEnterpriseDao,KwsEnt
         return list(Wrappers.<KwsEnterprise>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
                 .eq(BaseModel::getStatus, 0)
+                .eq(KwsEnterprise::getApproval, ApprovalEnum.OK.getCode())
                 .in(KwsEnterprise::getId, entIds)
                 .like(StringUtils.isNotBlank(entName), KwsEnterprise::getFirmName, entName));
     }