From 801e01a43b9e65edae2d7033830a34a90bf767df Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Sat, 3 Jun 2023 17:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinBillApplicationService.java                 | 14 +++++++-------
 .../AppBusAdvanceGinvoiceapplyService.java         | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 6f333e1514..7ed64880f2 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -988,6 +988,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         bv.setBusinessSid(businessSid);
         //用户sid
         bv.setUserSid(dto.getCreateBySid());
+        //流程定义id
+        String billStateKey = dto.getBillStateKey();
+        if ("003".equals(billStateKey)) {
+            bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
+        } else {
+            bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
+        }
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@@ -997,13 +1004,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();
         //=======================================
         bv.setFormVariables(variables);
-        //流程定义id
-        String billStateKey = dto.getBillStateKey();
-        if ("003".equals(billStateKey)) {
-            bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
-        } else {
-            bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
-        }
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             if (!voResultBean.getSuccess()) {
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
index cc16351dae..ec22f23bd7 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
@@ -543,7 +543,7 @@ public class AppBusAdvanceGinvoiceapplyService {
 
     public ResultBean saveAdvanceInvoiceLP(AdvanceInvoiceDto dto) {
         FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
-        BeanUtil.copyProperties(dto, finBillApplicationDto, "arrearsCollectionAppendxs");
+        BeanUtil.copyProperties(dto, finBillApplicationDto, "arrearsCollectionAppendxs", "fjApplicationAppendxs");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         if (StringUtils.isBlank(dto.getQkkpBillNo())) {
             finBillApplicationDto.setQkkpBillNo(dto.getBillNo());
@@ -631,7 +631,7 @@ public class AppBusAdvanceGinvoiceapplyService {
     public ResultBean submitAdvanceInvoiceInfo(SubmitAdvanceInvoiceDto dto) {
         ResultBean rb = ResultBean.fireFail();
         SubmitFinBillApplicationDto submitAdvanceInvoiceDto = new SubmitFinBillApplicationDto();
-        BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto,"arrearsCollectionAppendxs");
+        BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto, "arrearsCollectionAppendxs");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         submitAdvanceInvoiceDto.setUseOrgSid(useOrgSid);
         submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid());
@@ -1148,7 +1148,7 @@ public class AppBusAdvanceGinvoiceapplyService {
     public ResultBean submitAdvanceInvoiceInfoQKLP(SubmitAdvanceInvoiceDto dto) {
         ResultBean rb = ResultBean.fireFail();
         SubmitFinBillApplicationDto submitAdvanceInvoiceDto = new SubmitFinBillApplicationDto();
-        BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto, "arrearsCollectionAppendxs");
+        BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto, "arrearsCollectionAppendxs", "fjApplicationAppendxs");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         submitAdvanceInvoiceDto.setUseOrgSid(useOrgSid);
         submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid());
@@ -1419,10 +1419,10 @@ public class AppBusAdvanceGinvoiceapplyService {
 
     public ResultBean<String> qkApplyPdf(String sid, String userName) {
         ResultBean<String> rb = ResultBean.fireFail();
-        ResultBean<String> resultBean = finBillApplicationFeign.createPdf(sid,userName);
-        if(resultBean.getData() != null){
+        ResultBean<String> resultBean = finBillApplicationFeign.createPdf(sid, userName);
+        if (resultBean.getData() != null) {
             String url = resultBean.getData();
-            url =fileUploadComponent.getUrlPrefix()+url;
+            url = fileUploadComponent.getUrlPrefix() + url;
             return rb.success().setData(url);
         }
         return rb;