|
|
@@ -804,14 +804,17 @@ public class ContractMakingServiceImpl implements ContractMakingService {
|
|
|
Map<String, Object> procVariables = new HashMap<>();
|
|
|
String key = ConstantUtil.FINANCING_APPLY;
|
|
|
CFinancingBasicInfo financingBasicInfo = financingBasicInfoService.getById(quotaDisburse.getFinancingBasicInfoId());
|
|
|
- Long assigneeId = assigneeService.getIdByBusiness(financingBasicInfo.getId(), key, ConstantUtil.ASSIGNEE_C_SUPPLIER);
|
|
|
+
|
|
|
if (contractInfo.getConclusion().equals(ConstantConversionUtil.APPROVAL_RESULT_PASS)) {
|
|
|
//修改融资申请当前阶段
|
|
|
financingBasicInfo.setCurrentStage(FinancingCurrentStageEnum.CONTRACT_SIGNING.getCode());
|
|
|
financingBasicInfoService.updateById(financingBasicInfo);
|
|
|
+ if (contractInfo.getContractSignMethod() != null && contractInfo.getContractSignMethod().equals(0)) {
|
|
|
+ //如果是线下签
|
|
|
+ procVariables.put(ConstantUtil.PAYMENT_APPLY_ASSIGNEE, assigneeService.getIdByBusiness(financingBasicInfo.getId(), key, ConstantUtil.ASSIGNEE_PROJECT_MANAGER));
|
|
|
+ } else if (contractInfo.getContractSignMethod().equals(1)) {
|
|
|
+ procVariables.put(ConstantUtil.CONTRACT_SIGNING_ASSIGNEE, assigneeService.getIdByBusiness(financingBasicInfo.getId(), key, ConstantUtil.ASSIGNEE_C_SUPPLIER));
|
|
|
|
|
|
- procVariables.put(ConstantUtil.CONTRACT_SIGNING_ASSIGNEE, assigneeId);
|
|
|
- if (contractInfo.getContractSignMethod().equals(1)) {
|
|
|
List<String> electronicSigns = contractInfo.getElectronicSign();
|
|
|
if (electronicSigns != null && !electronicSigns.isEmpty()) {
|
|
|
//制作电子签合同
|
