修改融资申请流程

src/main/java/com/sunxung/factoring/service/financing/contract/impl/ContractMakingServiceImpl.java

@@ -46,7 +46,6 @@ import com.sunxung.factoring.service.sys.SerialNumberGenerator;
 import com.sunxung.factoring.service.sys.dto.AttachmentDto;
 import com.sunxung.factoring.service.sys.flowable.FlowableService;
 import com.sunxung.factoring.service.tradingPlatform.PlatformService;
-import org.apache.bcel.classfile.Code;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.util.PDFTextStripper;
@@ -722,7 +721,7 @@ public class ContractMakingServiceImpl implements ContractMakingService {
         List<ContractBasicContract> oldBasicContractList = contractBasicContractService.list(new QueryWrapper<ContractBasicContract>()
                 .eq("contract_info_id", contractInfo.getId()));
         if (CollectionUtil.isNotEmpty(oldBasicContractList)) {
-            oldBasicContractList.stream().forEach(contractBasicContract ->
+            oldBasicContractList.forEach(contractBasicContract ->
                     contractBasicContractChangeContentService.remove(new QueryWrapper<ContractBasicContractChangeContent>()
                             .eq("contract_info_id", contractInfo.getId())
                             .eq("contract_basic_contract_id", contractBasicContract.getId()))
@@ -735,7 +734,7 @@ public class ContractMakingServiceImpl implements ContractMakingService {
                 basicContract.setContractInfoId(contractInfo.getId());
                 contractBasicContractService.updateById(basicContract);
                 List<ContractBasicContractChangeContent> list = basicContract.getContractContentList();
-                if (null != list && list.size() > 0) {
+                if (null != list && !list.isEmpty()) {
                     for (ContractBasicContractChangeContent changeContent : list) {
                         changeContent.setContractBasicContractId(basicContract.getId());
                         changeContent.setContractInfoId(contractInfo.getId());
@@ -814,7 +813,7 @@ public class ContractMakingServiceImpl implements ContractMakingService {
                 procVariables.put(ConstantUtil.CONTRACT_SIGNING_ASSIGNEE, assigneeId);
                 if (contractInfo.getContractSignMethod().equals(1)) {
                     List<String> electronicSigns = contractInfo.getElectronicSign();
-                    if (electronicSigns != null && electronicSigns.size() > 0) {
+                    if (electronicSigns != null && !electronicSigns.isEmpty()) {
                         //制作电子签合同
                         makeElectronicFile(contractInfo, electronicSigns, contractInfoHis);
                     }
@@ -840,6 +839,10 @@ public class ContractMakingServiceImpl implements ContractMakingService {
                             + ConstantConversionUtil.flowBusinessKeyNames.get(key) + "—formBusiness”阶段，");
             String conclusion = ConstantConversionUtil.processApprovalResult.get(contractInfo.getConclusion()).equals("驳回") ?
                     "退回" : ConstantConversionUtil.processApprovalResult.get(contractInfo.getConclusion());
+            if (contractInfo.getContractSignMethod() != null && contractInfo.getContractSignMethod().equals(0)) {
+                //如果是线下签
+                conclusion = "线下签";
+            }
             Boolean result = flowableService.completeMyTask(contractInfo.getTaskId(), financingBasicInfo, procVariables,
                     conclusion, contractInfoHis.getId(), msgVariables, key);
             if (result == null || !result) {