|
@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.deepoove.poi.config.Configure;
|
|
|
import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
|
|
|
-import com.trade.client.config.CustomizeConfiguration;
|
|
|
import com.trade.client.enterprise.customer.domain.model.LoginUserInfo;
|
|
|
import com.trade.client.trade.purchasecontract.dto.PurchaseContractSearchDto;
|
|
|
import com.trade.client.trade.purchasecontract.dto.PurchaseContractUploadDto;
|
|
@@ -22,6 +21,7 @@ import com.trade.common.validate.ValidatorGroup;
|
|
|
import com.trade.common.validate.ValidatorUtil;
|
|
|
import com.trade.service.DictConstants;
|
|
|
import com.trade.service.TransStruct;
|
|
|
+import com.trade.service.contract.config.ContractConfigProperties;
|
|
|
import com.trade.service.contract.constant.ContractConstant;
|
|
|
import com.trade.service.contract.dto.*;
|
|
|
import com.trade.service.contract.service.ContractService;
|
|
@@ -115,7 +115,7 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
|
|
|
@Resource
|
|
|
private PurchaseOrderService purchaseOrderService;
|
|
|
@Resource
|
|
|
- private CustomizeConfiguration customizeConfiguration;
|
|
|
+ private ContractConfigProperties contractConfigProperties;
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -894,9 +894,9 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
|
|
|
*/
|
|
|
private List<ContractSeal> getContractSeals(SignPartyInfo signPartyInfo, String companySignKeyword,
|
|
|
String personalSignKeyword) {
|
|
|
- boolean autoSign = CollUtil.isNotEmpty(customizeConfiguration.getAutoSignEnterpriseCertNoList())
|
|
|
- && customizeConfiguration.getAutoSignEnterpriseCertNoList()
|
|
|
- .contains(signPartyInfo.getEnterpriseCertNo());
|
|
|
+ boolean autoSign = CollUtil.isNotEmpty(contractConfigProperties.getESignSealIdMap())
|
|
|
+ && contractConfigProperties.getESignSealIdMap()
|
|
|
+ .containsKey(signPartyInfo.getEnterpriseCertNo());
|
|
|
List<ContractSeal> sealInfoList = new ArrayList<>();
|
|
|
ContractSeal companySeal = new ContractSeal();
|
|
|
companySeal.setAutoSign(autoSign);
|