From 7fa91ed9b91d1eb3a2440616b923a471aeaf5125 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 7 Aug 2024 14:03:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=B0=E8=B4=A6=E7=8A=B6=E6=80=81=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81=EF=BC=88?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=B8=8A=E4=BC=A0=E7=9A=84=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingSituationServiceImpl.java   |  5 +++++
 .../jero/meeting/vo/excel/CommitteeSituationExcel.java | 10 ++++++++++
 .../jero/meeting/vo/excel/CouncilSituationExcel.java   | 10 ++++++++++
 .../meeting/vo/excel/DraftingGroupSituationExcel.java  | 10 ++++++++++
 .../meeting/vo/excel/InternationalSituationExcel.java  |  9 +++++++++
 .../com/jero/meeting/vo/excel/SituationBaseExcel.java  |  4 ++--
 .../java/com/jero/meeting/vo/excel/SituationExcel.java | 10 ++++++++++
 .../jero/meeting/vo/excel/StandardsSituationExcel.java |  9 +++++++++
 .../meeting/vo/excel/WorkingGroupSituationExcel.java   | 10 ++++++++++
 9 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 077b7c88..96d660ff 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -1792,6 +1792,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 OSSFile ossFile = ossFileService.getById(checkFile);
                 meetingSituation.setCheckFile(ossFile.getUrl());
             }
+            String paymentRecord = meetingSituation.getPaymentRecord();
+            if (StringUtils.isNotBlank(paymentRecord)) {
+                OSSFile ossFile = ossFileService.getById(paymentRecord);
+                meetingSituation.setPaymentRecord(ossFile.getUrl());
+            }
             switch (meetingType1) {
                 case MeetingCommon.STANDARD_MEETING:
                     //保存数据
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeSituationExcel.java
index b76fb4ea..8553a869 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeSituationExcel.java
@@ -1,6 +1,7 @@
 package com.jero.meeting.vo.excel;
 
 import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
@@ -72,6 +73,15 @@ public class CommitteeSituationExcel extends SituationBaseExcel {
     @Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
     private Integer needInvoice;
 
+    /**缴费凭证*/
+    @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
+    private String paymentRecord;
+
+    /**到账*/
+    @ApiModelProperty(value = "到账")
+    @Excel(name = "是否到账", width = 15, dicCode = "account_type")
+    private Integer inAccount;
+
     /**订单后4位编码*/
     @Excel(name = "订单后4位编码", width = 15)
     private String orderCode;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CouncilSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CouncilSituationExcel.java
index dc681247..b62c133b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CouncilSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CouncilSituationExcel.java
@@ -1,6 +1,7 @@
 package com.jero.meeting.vo.excel;
 
 import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
@@ -72,6 +73,15 @@ public class CouncilSituationExcel extends SituationBaseExcel {
     @Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
     private Integer needInvoice;
 
+    /**缴费凭证*/
+    @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
+    private String paymentRecord;
+
+    /**到账*/
+    @ApiModelProperty(value = "到账")
+    @Excel(name = "是否到账", width = 15, dicCode = "account_type")
+    private Integer inAccount;
+
     /**订单后4位编码*/
     @Excel(name = "订单后4位编码", width = 15)
     private String orderCode;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java
index 647ec1da..b4a38fdd 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java
@@ -1,6 +1,7 @@
 package com.jero.meeting.vo.excel;
 
 import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
@@ -68,6 +69,15 @@ public class DraftingGroupSituationExcel extends SituationBaseExcel {
     @Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
     private Integer needInvoice;
 
+    /**缴费凭证*/
+    @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
+    private String paymentRecord;
+
+    /**到账*/
+    @ApiModelProperty(value = "到账")
+    @Excel(name = "是否到账", width = 15, dicCode = "account_type")
+    private Integer inAccount;
+
     /**订单后4位编码*/
     @Excel(name = "订单后4位编码", width = 15)
     private String orderCode;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
index 43632b8d..5d63f4db 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
@@ -142,6 +142,15 @@ public class InternationalSituationExcel extends SituationBaseExcel {
     @Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
     private Integer needInvoice;
 
+    /**缴费凭证*/
+    @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
+    private String paymentRecord;
+
+    /**到账*/
+    @ApiModelProperty(value = "到账")
+    @Excel(name = "是否到账", width = 15, dicCode = "account_type")
+    private Integer inAccount;
+
     /**订单后4位编码*/
     @Excel(name = "订单后4位编码", width = 15)
     private String orderCode;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationBaseExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationBaseExcel.java
index 00d289d0..16d5bc6f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationBaseExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationBaseExcel.java
@@ -1,5 +1,6 @@
 package com.jero.meeting.vo.excel;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
@@ -10,9 +11,8 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @Data
 public class SituationBaseExcel {
     /**签到文件*/
-    @Excel(name = "手动签到", type = 2 ,width = 40 , height = 20,imageType = 3)
+    @Excel(name = "手动签到", type = 2 ,width = 40 , height = 20)
     private String checkFile;
-
     /**发票项目*/
     @Excel(name = "发票项目", dicCode = "invoice_project", width = 15)
     private Integer invoiceProject;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationExcel.java
index a4e06806..12764336 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationExcel.java
@@ -1,6 +1,7 @@
 package com.jero.meeting.vo.excel;
 
 import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
@@ -72,6 +73,15 @@ public class SituationExcel  extends SituationBaseExcel{
     @Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
     private Integer needInvoice;
 
+    /**缴费凭证*/
+    @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
+    private String paymentRecord;
+
+    /**到账*/
+    @ApiModelProperty(value = "到账")
+    @Excel(name = "是否到账", width = 15, dicCode = "account_type")
+    private Integer inAccount;
+
     /**订单后4位编码*/
     @Excel(name = "订单后4位编码", width = 15)
     private String orderCode;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java
index 623aa67c..3d2fc6cb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java
@@ -88,6 +88,15 @@ public class StandardsSituationExcel extends SituationBaseExcel {
     @Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
     private Integer needInvoice;
 
+    /**缴费凭证*/
+    @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
+    private String paymentRecord;
+
+    /**到账*/
+    @ApiModelProperty(value = "到账")
+    @Excel(name = "是否到账", width = 15, dicCode = "account_type")
+    private Integer inAccount;
+
     /**订单后4位编码*/
     @Excel(name = "订单后4位编码", width = 15)
     private String orderCode;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/WorkingGroupSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/WorkingGroupSituationExcel.java
index 3d1aa14e..105eabb1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/WorkingGroupSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/WorkingGroupSituationExcel.java
@@ -1,6 +1,7 @@
 package com.jero.meeting.vo.excel;
 
 import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -73,6 +74,15 @@ public class WorkingGroupSituationExcel extends SituationBaseExcel {
     @Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
     private Integer needInvoice;
 
+    /**缴费凭证*/
+    @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
+    private String paymentRecord;
+
+    /**到账*/
+    @ApiModelProperty(value = "到账")
+    @Excel(name = "是否到账", width = 15, dicCode = "account_type")
+    private Integer inAccount;
+
     /**订单后4位编码*/
     @Excel(name = "订单后4位编码", width = 15)
     private String orderCode;