问题优化

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -1794,6 +1794,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
         //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
         variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
+        if("Activity_1aja6s0".equals(bv.getTaskDefKey())){//分公司销售内勤的节点id
+            //分公司销售内勤审批->销售部经理审批
+            List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
+            SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
+            String nextNodeUserSids_ = sysOrganization.getManagerSid();
+            bv.setNextNodeUserSids(nextNodeUserSids_);
+        }
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -2454,6 +2461,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         variables.put("app", appMap);
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
+        if("Activity_1aja6s0".equals(bv.getTaskDefKey())){//分公司销售内勤的节点id
+            //分公司销售内勤审批->销售部经理审批
+            List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
+            SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
+            String nextNodeUserSids_ = sysOrganization.getManagerSid();
+            bv.setNextNodeUserSids(nextNodeUserSids_);
+        }
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -248,6 +248,7 @@ public class AppBusAdvanceGinvoiceapplyService {
                 vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid());
                 vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
                 vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
+                vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto());
                 vinListVos.add(vinListVo);
             }
         }
@@ -858,6 +859,7 @@ public class AppBusAdvanceGinvoiceapplyService {
                 vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid());
                 vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
                 vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
+                vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto());
                 vinListVos.add(vinListVo);
             }
         }