feat(供应商)：流程调整

src/main/java/com/sunxung/factoring/entity/supplier/CreditSituation.java

@@ -22,10 +22,10 @@ public class CreditSituation extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * c端 供应商企业信息id
+     * 审核第一步id
      */
-    @TableField("c_supplier_info_id")
-    private Long cSupplierInfoId;
+    @TableField("supplier_approval_first_id")
+    private Long supplierApprovalFirstId;
 
     /**
      * c端 征信相关情况 企业负责人
@@ -489,12 +489,12 @@ public class CreditSituation extends BaseEntity {
         this.creditInvestigationInfoHistory = creditInvestigationInfoHistory;
     }
 
-    public Long getcSupplierInfoId() {
-        return cSupplierInfoId;
+    public Long getSupplierApprovalFirstId() {
+        return supplierApprovalFirstId;
     }
 
-    public void setcSupplierInfoId(Long cSupplierInfoId) {
-        this.cSupplierInfoId = cSupplierInfoId;
+    public void setSupplierApprovalFirstId(Long supplierApprovalFirstId) {
+        this.supplierApprovalFirstId = supplierApprovalFirstId;
     }
 
     public Long getcCreditInvestigationInfoHistoryId() {

src/main/java/com/sunxung/factoring/entity/supplier/SupplierApprovalFirst.java

@@ -53,6 +53,45 @@ public class SupplierApprovalFirst extends BaseEntity {
     @TableField("guarantee_enterprise_result")
     private String guaranteeEnterpriseResult;
 
+    @TableField("visible")
+    private Boolean visible;
+
+    /**
+     * 审批意见
+     */
+    @TableField("approval_comment")
+    private String approvalComment;
+
+    /**
+     * 审批结论
+     */
+    @TableField("approval_conclusion")
+    private String approvalConclusion;
+
+    public String getApprovalComment() {
+        return approvalComment;
+    }
+
+    public void setApprovalComment(String approvalComment) {
+        this.approvalComment = approvalComment;
+    }
+
+    public String getApprovalConclusion() {
+        return approvalConclusion;
+    }
+
+    public void setApprovalConclusion(String approvalConclusion) {
+        this.approvalConclusion = approvalConclusion;
+    }
+
+    public Boolean getVisible() {
+        return visible;
+    }
+
+    public void setVisible(Boolean visible) {
+        this.visible = visible;
+    }
+
     public Long getcSupplierInfoHistoryId() {
         return cSupplierInfoHistoryId;
     }

src/main/java/com/sunxung/factoring/entity/supplier/SupplierInfo.java

@@ -94,6 +94,19 @@ public class SupplierInfo extends Project {
     @TableField("visible")
     private Boolean visible;
 
+    /**
+     * 审批意见
+     */
+    @TableField(exist = false)
+    private String approvalComment;
+
+    /**
+     * 审批结论
+     */
+    @TableField(exist = false)
+    private String approvalConclusion;
+
+
     @TableField(exist = false)
     private String supplierName;
 
@@ -142,6 +155,23 @@ public class SupplierInfo extends Project {
     @TableField(exist = false)
     private List<String> errors;
 
+    public String getApprovalComment() {
+        return approvalComment;
+    }
+
+    public void setApprovalComment(String approvalComment) {
+        this.approvalComment = approvalComment;
+    }
+
+    public String getApprovalConclusion() {
+        return approvalConclusion;
+    }
+
+    public void setApprovalConclusion(String approvalConclusion) {
+        this.approvalConclusion = approvalConclusion;
+    }
+
+
     public List<String> getErrorList() {
         return errors;
     }

src/main/java/com/sunxung/factoring/service/supplier/impl/SupplierApprovalFirstServiceImpl.java

@@ -135,21 +135,40 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void firstReview(SupplierInfo supplierInfo) {
-        //保存企业审核信息
-        Enterprise enterprise = supplierInfo.getEnterprise();
-        saveInfo(enterprise,supplierInfo.getId());
-        //保存担保企业审核信息
+        //保存第一步审核结论
+        SupplierApprovalFirst supplierApprovalFirst = lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, supplierInfo.getId()).eq(SupplierApprovalFirst::getVisible, false).one();
+        if(supplierApprovalFirst == null){
+            supplierApprovalFirst = new SupplierApprovalFirst();
+        }
+        supplierApprovalFirst.setVisible(supplierInfo.getVisible());
+        supplierApprovalFirst.setApprovalComment(supplierInfo.getApprovalComment());
+        supplierApprovalFirst.setApprovalConclusion(supplierInfo.getApprovalConclusion());
+        save(supplierApprovalFirst);
         Enterprise guaranteeEnterprise = supplierInfo.getGuaranteeEnterprise();
-        if(guaranteeEnterprise != null){
-            saveInfo(guaranteeEnterprise, supplierInfo.getId());
+        Enterprise enterprise = supplierInfo.getEnterprise();
+        if(supplierInfo.getApprovalConclusion().equals(ConstantConversionUtil.APPROVAL_RESULT_PASS)){
+            supplierInfo.setSupplierApprovalFirst(supplierApprovalFirst);
+            //保存企业审核信息
+            saveInfo(enterprise,supplierApprovalFirst.getId());
+            //保存担保企业审核信息
+            if(guaranteeEnterprise != null){
+                saveInfo(guaranteeEnterprise, supplierApprovalFirst.getId());
+            }
         }
         //流程处理
         if(supplierInfo.getVisible()){
             //保存第一步审核结论
-            SupplierApprovalFirst supplierApprovalFirst = measurement(supplierInfo);
-            save(supplierApprovalFirst);
+            supplierApprovalFirst = measurement(supplierInfo);
+            updateById(supplierApprovalFirst);
             String taskId = supplierInfo.getTaskId();
-            String result = "通过";
+            String result ;
+            if(supplierInfo.getApprovalConclusion().equals(ConstantConversionUtil.APPROVAL_RESULT_BACK)){
+                result = "退回";
+            }else if(supplierInfo.getApprovalConclusion().equals(ConstantConversionUtil.APPROVAL_RESULT_PASS)){
+                result = "通过";
+            }else {
+                throw new ServiceException(CodeUtil.FAIL,"审批结论出错！");
+            }
             Long mainEnterpriseCount = supplierApprovalFirst.getMainEnterpriseCount();
             if(mainEnterpriseCount > 0){
                 result = "红否";
@@ -169,7 +188,13 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
                         "供应商名称为“" + enterprise.getCorporateName() + "”的供应商已进入“"
                                 + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.SUPPLIER_INFO) + "—供应商审核第二步，"
                                 + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+            }else if(result.equals("退回")){
+                msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
+                        "供应商名称为“" + enterprise.getCorporateName() + "”的供应商已进入“"
+                                + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.SUPPLIER_INFO) + "—C端供应商录入，"
+                                + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
             }else {
+                supplierApprovalFirst.setApprovalConclusion(ConstantConversionUtil.APPROVAL_RESULT_VETO);
                 supplierInfoService.lambdaUpdate().eq(SupplierInfo::getId,supplierInfo.getId()).set(SupplierInfo::getStatusStr, SupplierStatusEnums.VOTE.getCode()).update();
                 msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
                         "供应商名称为“" + enterprise.getCorporateName() + "”的供应商审核已被否决");
@@ -185,8 +210,8 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
             for (CreditSituation creditSituation : creditSituations) {
                 creditSituationService.lambdaUpdate()
                         .eq(CreditSituation::getcCreditInvestigationInfoHistoryId,creditSituation.getcCreditInvestigationInfoHistoryId())
-                        .eq(CreditSituation::getcSupplierInfoId,id).remove();
-                creditSituation.setcSupplierInfoId(id);
+                        .eq(CreditSituation::getSupplierApprovalFirstId,id).remove();
+                creditSituation.setSupplierApprovalFirstId(id);
                 creditSituationService.save(creditSituation);
             }
         }else {
@@ -280,29 +305,31 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
         User riskManager = userService.get(dueDiligenceAllocation.getRiskManagerId());
         dueDiligenceAllocation.setRiskManager(riskManager);
         supplierInfo.setDueDiligenceAllocation(dueDiligenceAllocation);
-
-        SupplierApprovalFirst supplierApprovalFirst = lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, id).one();
+        SupplierApprovalFirst supplierApprovalFirst = lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, id).eq(SupplierApprovalFirst::getVisible,false)
+                .orderByDesc(SupplierApprovalFirst::getGmtCreate).list().get(0);
         supplierInfo.setHistoryId(supplierInfoHistory.getId());
         supplierInfo.setSupplierApprovalFirst(supplierApprovalFirst);
 
         CEnterpriseHistory enterpriseHistory = enterpriseHistoryService.getById(supplierInfoHistory.getcEnterpriseHistoryId());
         Enterprise enterprise = enterpriseService.getById(supplierInfo.getcEnterpriseId());
-        autoFirstReview(id,enterprise,enterpriseHistory);
+        autoFirstReview(supplierInfo,enterprise,enterpriseHistory);
         supplierInfo.setEnterprise(enterprise);
         supplierInfo.setHasGuaranteeEnterprise(false);
         if(supplierInfo.getGuaranteeEnterpriseId() != null){
             supplierInfo.setHasGuaranteeEnterprise(true);
             CEnterpriseHistory enteguaranteeHistory = enterpriseHistoryService.getById(supplierInfoHistory.getGuaranteeEnterpriseHistoryId());
             Enterprise guaranteeEnterprise = enterpriseService.getById(supplierInfo.getGuaranteeEnterpriseId());
-            autoFirstReview(id,guaranteeEnterprise, enteguaranteeHistory);
+            autoFirstReview(supplierInfo,guaranteeEnterprise, enteguaranteeHistory);
             supplierInfo.setGuaranteeEnterprise(guaranteeEnterprise);
         }
         return supplierInfo;
     }
 
-    private void autoFirstReview(Long id,Enterprise enterprise, CEnterpriseHistory enterpriseHistory) {
+    private void autoFirstReview(SupplierInfo supplierInfo,Enterprise enterprise, CEnterpriseHistory enterpriseHistory) {
+        Long firstReviewId = supplierInfo.getSupplierApprovalFirst().getId();
+        Long id = supplierInfo.getId();
         //企业负责人征信情况
-        List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getcSupplierInfoId, id).list();
+        List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getSupplierApprovalFirstId, firstReviewId).list();
         List<CreditSituation> creditSituationsResult = new ArrayList<>();
         if(CollectionUtil.isNotEmpty(creditSituations)){
             for (CreditSituation creditSituation : creditSituations) {
@@ -349,7 +376,7 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
                         creditInvestigationInfoHistory.setTypeStr(dictionaryService.getByCode(creditInvestigationInfoHistory.getType()).getName());
                         creditInvestigationInfoHistory.setCardFiles(cardFiles);
                         CreditSituation creditSituation = new CreditSituation();
-                        creditSituation.setcSupplierInfoId(id);
+                        creditSituation.setSupplierApprovalFirstId(firstReviewId);
                         creditSituation.setcCreditInvestigationInfoHistoryId(creditInvestigationInfoHistory.getId());
                         //todo 填充征信报告
                         CreditInfo creditInfo = creditService.lambdaQuery().eq(CreditInfo::getCardNo, creditInvestigationInfoHistory.getSocialCreditCode()).one();
@@ -611,14 +638,14 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
         supplierInfo.setSupplierApprovalFirst(supplierApprovalFirst);
         CEnterpriseHistory enterpriseHistory = enterpriseHistoryService.getById(supplierInfoHistory.getcEnterpriseHistoryId());
         Enterprise enterprise = enterpriseService.getById(supplierInfo.getcEnterpriseId());
-        autoView(supplierInfo.getId(),enterprise,enterpriseHistory);
+        autoView(supplierInfo,enterprise,enterpriseHistory);
         supplierInfo.setEnterprise(enterprise);
         supplierInfo.setHasGuaranteeEnterprise(false);
         if(supplierInfo.getGuaranteeEnterpriseId() != null){
             supplierInfo.setHasGuaranteeEnterprise(true);
             CEnterpriseHistory guaranteeHistory = enterpriseHistoryService.getById(supplierInfoHistory.getGuaranteeEnterpriseHistoryId());
             Enterprise guarantee = enterpriseService.getById(supplierInfo.getGuaranteeEnterpriseId());
-            autoView(supplierInfo.getId(),guarantee,guaranteeHistory);
+            autoView(supplierInfo,guarantee,guaranteeHistory);
             supplierInfo.setGuaranteeEnterprise(guarantee);
         }
         return supplierInfo;
@@ -626,7 +653,7 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
 
     @Override
     public SupplierApprovalFirst measurement(SupplierInfo supplierInfo) {
-        SupplierApprovalFirst supplierApprovalFirst = new SupplierApprovalFirst();
+        SupplierApprovalFirst supplierApprovalFirst = supplierInfo.getSupplierApprovalFirst();
         supplierApprovalFirst.setcSupplierInfoId(supplierInfo.getId());
         supplierApprovalFirst.setcSupplierInfoHistoryId(supplierInfo.getHistoryId());
         //企业审核信息
@@ -645,10 +672,10 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
         List<CreditSituation> creditSituations = enterprise.getCreditSituations();
         if(CollectionUtil.isNotEmpty(creditSituations)){
             for (CreditSituation creditSituation : creditSituations) {
-                creditSituation.setcSupplierInfoId(supplierApprovalFirst.getcSupplierInfoId());
+                creditSituation.setSupplierApprovalFirstId(supplierApprovalFirst.getId());
                 creditSituationService.lambdaUpdate()
                         .eq(CreditSituation::getcCreditInvestigationInfoHistoryId,creditSituation.getcCreditInvestigationInfoHistoryId())
-                        .eq(CreditSituation::getcSupplierInfoId,supplierApprovalFirst.getcSupplierInfoId()).remove();
+                        .eq(CreditSituation::getSupplierApprovalFirstId,supplierApprovalFirst.getId()).remove();
                 creditSituationService.save(creditSituation);
                 //近两年发生过逾期的账户数≥3且合计金额≥5000元
                 if(creditSituation.getNumberOfOverdueAccounts() >= 3 && creditSituation.getTotalOverdueAmount().compareTo(new BigDecimal(5000)) > -1){
@@ -790,9 +817,11 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
         }
     }
 
-    private void autoView(Long id, Enterprise enterprise,CEnterpriseHistory enterpriseHistory) {
+    private void autoView(SupplierInfo supplierInfo, Enterprise enterprise,CEnterpriseHistory enterpriseHistory) {
+        Long id = supplierInfo.getId();
+        Long firstReviewId = supplierInfo.getSupplierApprovalFirst().getId();
         //企业负责人征信情况
-        List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getcSupplierInfoId, id).list();
+        List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getSupplierApprovalFirstId, firstReviewId).list();
         List<CreditSituation> creditSituationsResult = new ArrayList<>();
         if(CollectionUtil.isNotEmpty(creditSituations)){
             for (CreditSituation creditSituation : creditSituations) {

src/main/java/com/sunxung/factoring/service/supplier/impl/SupplierApprovalSecondServiceImpl.java

@@ -145,6 +145,9 @@ public class SupplierApprovalSecondServiceImpl extends ServiceImpl<SupplierAppro
     @Autowired
     private ISysAttachmentRefService attachmentRefService;
 
+    @Autowired
+    private ISupplierApprovalFirstService supplierApprovalFirstService;
+
     @Value("${sop.getEnterpriseAreaUrl}")
     private String getEnterpriseArea;
 
@@ -545,8 +548,11 @@ public class SupplierApprovalSecondServiceImpl extends ServiceImpl<SupplierAppro
             }
             //企业负责人情况
             BigDecimal personScore;
+            SupplierApprovalFirst supplierApprovalFirst = supplierApprovalFirstService.lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, supplierApprovalSecond.getcSupplierInfoId())
+                    .eq(SupplierApprovalFirst::getVisible,true)
+                    .orderByDesc(SupplierApprovalFirst::getGmtCreate).list().get(0);
             List<CreditSituation> creditSituations = creditSituationService.lambdaQuery()
-                    .eq(CreditSituation::getcSupplierInfoId, supplierApprovalSecond.getcSupplierInfoId()).list();
+                    .eq(CreditSituation::getSupplierApprovalFirstId, supplierApprovalFirst.getId()).list();
             if (CollectionUtil.isNotEmpty(creditSituations)) {
                 creditSituations = creditSituations.stream().filter(r -> {
                     CCreditInvestigationInfoHistory creditInvestigationInfoHistory = creditInvestigationInfoHistoryService.getById(r.getcCreditInvestigationInfoHistoryId());

src/main/java/com/sunxung/factoring/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -207,6 +207,9 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
     @Autowired
     private FileStorageService fileStorageService;
 
+    @Autowired
+    private ISupplierApprovalFirstService supplierApprovalFirstService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String startProcess(SupplierInfo supplierInfo) {
@@ -270,7 +273,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
             msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "供应商名称：" + enterprise.getCorporateName());
             msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
                     "供应商名称为“" + enterprise.getCorporateName() + "”的供应商已进入“"
-                            + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.SUPPLIER_INFO) + "—供应商审核(第二步))，"
+                            + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.SUPPLIER_INFO) + "—供应商审核(第一步))，"
                             + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
             flowableService.completeMyTask(lastLog.getHistoricTaskId(), supplierInfo, procVariables, null, historyId, msgVariables, ConstantUtil.SUPPLIER_INFO);
             statusStr = SupplierStatusEnums.DUE_DILIGENCE_REVIEW.getCode();
@@ -737,8 +740,10 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
             Integer changes = restTemplate.getForObject(getChangesUrl, Integer.class);
             videoDueDiligence.setBasicChangeSize(changes);
             videoDueDiligence.setChangeMeasurementScore(supplierApprovalSecond.getBasicChangeScore());
+            SupplierApprovalFirst supplierApprovalFirst = supplierApprovalFirstService.lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, supplierId)
+                    .eq(SupplierApprovalFirst::getVisible,true).orderByDesc(SupplierApprovalFirst::getGmtCreate).list().get(0);
             //人员信息
-            List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getcSupplierInfoId, supplierId).list();
+            List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getSupplierApprovalFirstId, supplierApprovalFirst.getId()).list();
             creditSituations = creditSituations.stream().filter(r -> {
                 CCreditInvestigationInfoHistory creditInvestigationInfoHistory = creditInvestigationInfoHistoryService.getById(r.getcCreditInvestigationInfoHistoryId());
                 CEnterpriseHistory enterpriseHistoryServiceById = enterpriseHistoryService.getById(creditInvestigationInfoHistory.getcEnterpriseHistoryId());

src/main/java/com/sunxung/factoring/service/supplier/impl/VideoDueDiligenceServiceImpl.java

@@ -174,8 +174,13 @@ public class VideoDueDiligenceServiceImpl extends ServiceImpl<VideoDueDiligenceM
     @Autowired
     private FileStorageService fileStorageService;
 
+    @Autowired
+    private ISupplierApprovalFirstService supplierApprovalFirstService;
+
     @Override
     public VideoDueDiligence getVideoDueDiligence(Long supplierId) {
+        SupplierApprovalFirst supplierApprovalFirst = supplierApprovalFirstService.lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, supplierId).eq(SupplierApprovalFirst::getVisible,true)
+                .orderByDesc(SupplierApprovalFirst::getGmtCreate).list().get(0);
         SupplierApprovalSecond supplierApprovalSecond = supplierApprovalSecondService.lambdaQuery().eq(SupplierApprovalSecond::getcSupplierInfoId, supplierId).orderByDesc(SupplierApprovalSecond::getGmtCreate).list().get(0);
         SupplierInfo supplierInfo = supplierInfoService.get(supplierId);
         Enterprise enterprise = enterpriseService.getById(supplierInfo.getcEnterpriseId());
@@ -244,7 +249,7 @@ public class VideoDueDiligenceServiceImpl extends ServiceImpl<VideoDueDiligenceM
             videoDueDiligence.setChangeStandardScore(new BigDecimal("1"));
             videoDueDiligence.setChangeMeasurementScore(supplierApprovalSecond.getBasicChangeScore());
             //人员信息
-            List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getcSupplierInfoId, supplierId).list();
+            List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getSupplierApprovalFirstId, supplierApprovalFirst.getId()).list();
             creditSituations = creditSituations.stream().filter(r -> {
                 CCreditInvestigationInfoHistory creditInvestigationInfoHistory = creditInvestigationInfoHistoryService.getById(r.getcCreditInvestigationInfoHistoryId());
                 CEnterpriseHistory byId = enterpriseHistoryService.getById(creditInvestigationInfoHistory.getcEnterpriseHistoryId());
@@ -340,7 +345,7 @@ public class VideoDueDiligenceServiceImpl extends ServiceImpl<VideoDueDiligenceM
             List<FileStorage> shareholderFiles = getFiles(videoDueDiligence.getId(), FileModuleDict.ChildEnum.VIDEO_DUE_DILIGENCE_SHAREHOLDER_FILE);
             videoDueDiligence.setShareholderFile(shareholderFiles);
             //视频尽调企业人员
-            List<CreditSituation> creditSituations =  creditSituationService.lambdaQuery().eq(CreditSituation::getcSupplierInfoId, supplierId).list();
+            List<CreditSituation> creditSituations =  creditSituationService.lambdaQuery().eq(CreditSituation::getSupplierApprovalFirstId, supplierApprovalFirst.getId()).list();
             List<VideoDueDiligenceShareholdersSituation> videoDueDiligenceShareholdersSituations = videoDueDiligenceShareholdersSituationService.lambdaQuery().eq(VideoDueDiligenceShareholdersSituation::getVideoDueDiligenceId, videoDueDiligence.getId()).list();
             for (CreditSituation creditSituation : creditSituations) {
                 for (VideoDueDiligenceShareholdersSituation videoDueDiligenceShareholdersSituation : videoDueDiligenceShareholdersSituations) {

src/main/resources/diagrams/v1.0/SupplierInfo.bpmn

@@ -24,9 +24,6 @@
     <sequenceFlow id="flow11" name="未审核过" sourceRef="exclusivegateway3" targetRef="due_diligence_allocation">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result=='未审核过'}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow12" name="审核过" sourceRef="exclusivegateway3" targetRef="second_review">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result=='审核过'}]]></conditionExpression>
-    </sequenceFlow>
     <userTask id="due_diligence_reservation" name="尽调预约" activiti:assignee="${due_diligence_reservation_assignee}"></userTask>
     <sequenceFlow id="flow14" name="待视频尽调" sourceRef="exclusivegateway2" targetRef="due_diligence_reservation">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result=='待视频尽调'}]]></conditionExpression>
@@ -57,6 +54,12 @@
     <sequenceFlow id="flow30" name="非建工" sourceRef="exclusivegateway1" targetRef="due_diligence_reservation">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result=='非建工'}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="flow31" name="审核过" sourceRef="exclusivegateway3" targetRef="first_review">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result=='审核过'}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow32" name="退回" sourceRef="exclusivegateway5" targetRef="supplier_add">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result=='退回'}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_SupplierInfo">
     <bpmndi:BPMNPlane bpmnElement="SupplierInfo" id="BPMNPlane_SupplierInfo">
@@ -146,16 +149,6 @@
           <omgdc:Bounds height="14.0" width="48.0" x="279.0" y="250.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow12" id="BPMNEdge_flow12">
-        <omgdi:waypoint x="250.0" y="248.0"></omgdi:waypoint>
-        <omgdi:waypoint x="250.0" y="147.0"></omgdi:waypoint>
-        <omgdi:waypoint x="787.0" y="147.0"></omgdi:waypoint>
-        <omgdi:waypoint x="907.0" y="147.0"></omgdi:waypoint>
-        <omgdi:waypoint x="907.0" y="241.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="36.0" x="500.0" y="131.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14">
         <omgdi:waypoint x="1045.0" y="269.0"></omgdi:waypoint>
         <omgdi:waypoint x="1182.0" y="269.0"></omgdi:waypoint>
@@ -226,7 +219,25 @@
         <omgdi:waypoint x="1062.0" y="433.0"></omgdi:waypoint>
         <omgdi:waypoint x="1130.0" y="431.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="588.0" y="417.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="36.0" x="588.0" y="417.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow31" id="BPMNEdge_flow31">
+        <omgdi:waypoint x="250.0" y="248.0"></omgdi:waypoint>
+        <omgdi:waypoint x="247.0" y="183.0"></omgdi:waypoint>
+        <omgdi:waypoint x="634.0" y="183.0"></omgdi:waypoint>
+        <omgdi:waypoint x="637.0" y="242.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="36.0" x="413.0" y="161.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow32" id="BPMNEdge_flow32">
+        <omgdi:waypoint x="755.0" y="250.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="133.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="132.0" y="240.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="24.0" x="418.0" y="121.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>