|
@@ -852,12 +852,12 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
|
|
contractSignInfo.setSealInfoList(new ArrayList<>());
|
|
contractSignInfo.setSealInfoList(new ArrayList<>());
|
|
// 买方(甲方)签署
|
|
// 买方(甲方)签署
|
|
SignPartyInfo buyerInfo = getBuyerInfo(enterprise, purchaseContractDetailDto.getAgencyCertNo(), null);
|
|
SignPartyInfo buyerInfo = getBuyerInfo(enterprise, purchaseContractDetailDto.getAgencyCertNo(), null);
|
|
- List<ContractSeal> sealInfoList = getContractSeals(buyerInfo, ESignConstant.KEYWORD_PARTY_A,
|
|
|
|
- ESignConstant.KEYWORD_PARTY_3);
|
|
|
|
|
|
+ List<ContractSeal> sealInfoList = getContractSeals(buyerInfo, ESignConstant.KEYWORD_PARTY_A/*,
|
|
|
|
+ ESignConstant.KEYWORD_PARTY_3*/);
|
|
contractSignInfo.getSealInfoList().addAll(sealInfoList);
|
|
contractSignInfo.getSealInfoList().addAll(sealInfoList);
|
|
// 卖方(乙方)签署
|
|
// 卖方(乙方)签署
|
|
SignPartyInfo sellerInfo = getSellerInfo(enterprise, purchaseContractDetailDto.getVendorEntityNo(), null);
|
|
SignPartyInfo sellerInfo = getSellerInfo(enterprise, purchaseContractDetailDto.getVendorEntityNo(), null);
|
|
- sealInfoList = getContractSeals(sellerInfo, ESignConstant.KEYWORD_PARTY_B, ESignConstant.KEYWORD_PARTY_4);
|
|
|
|
|
|
+ sealInfoList = getContractSeals(sellerInfo, ESignConstant.KEYWORD_PARTY_B/*, ESignConstant.KEYWORD_PARTY_4*/);
|
|
contractSignInfo.getSealInfoList().addAll(sealInfoList);
|
|
contractSignInfo.getSealInfoList().addAll(sealInfoList);
|
|
signeInfoList.add(contractSignInfo);
|
|
signeInfoList.add(contractSignInfo);
|
|
signInput.setSigneInfoList(signeInfoList);
|
|
signInput.setSigneInfoList(signeInfoList);
|
|
@@ -892,8 +892,8 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
|
|
* @param personalSignKeyword
|
|
* @param personalSignKeyword
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- private List<ContractSeal> getContractSeals(SignPartyInfo signPartyInfo, String companySignKeyword,
|
|
|
|
- String personalSignKeyword) {
|
|
|
|
|
|
+ private List<ContractSeal> getContractSeals(SignPartyInfo signPartyInfo, String companySignKeyword/*,
|
|
|
|
+ String personalSignKeyword*/) {
|
|
boolean autoSign = CollUtil.isNotEmpty(contractConfigProperties.getESignSealIdMap())
|
|
boolean autoSign = CollUtil.isNotEmpty(contractConfigProperties.getESignSealIdMap())
|
|
&& contractConfigProperties.getESignSealIdMap().containsKey(signPartyInfo.getEnterpriseCertNo());
|
|
&& contractConfigProperties.getESignSealIdMap().containsKey(signPartyInfo.getEnterpriseCertNo());
|
|
List<ContractSeal> sealInfoList = new ArrayList<>();
|
|
List<ContractSeal> sealInfoList = new ArrayList<>();
|
|
@@ -912,11 +912,11 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
|
|
signer.setSignerIdType(ESignConstant.CRED_PSN_CH_IDCARD);
|
|
signer.setSignerIdType(ESignConstant.CRED_PSN_CH_IDCARD);
|
|
signer.setMobile(signPartyInfo.getLegalPersonPhone());
|
|
signer.setMobile(signPartyInfo.getLegalPersonPhone());
|
|
companySeal.setSigner(signer);
|
|
companySeal.setSigner(signer);
|
|
- ContractSeal legalSeal = new ContractSeal();
|
|
|
|
|
|
+/* ContractSeal legalSeal = new ContractSeal();
|
|
legalSeal.setSigner(signer);
|
|
legalSeal.setSigner(signer);
|
|
legalSeal.setKeywords(Collections.singletonList(personalSignKeyword));
|
|
legalSeal.setKeywords(Collections.singletonList(personalSignKeyword));
|
|
legalSeal.setWithTime(true);
|
|
legalSeal.setWithTime(true);
|
|
- sealInfoList.add(legalSeal);
|
|
|
|
|
|
+ sealInfoList.add(legalSeal);*/
|
|
}
|
|
}
|
|
sealInfoList.add(companySeal);
|
|
sealInfoList.add(companySeal);
|
|
return sealInfoList;
|
|
return sealInfoList;
|