From 60656f9a2ef9996ee9d9cb241ab26fb2bea7b35c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 19 Jul 2023 15:09:30 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=91=E7=A5=A8=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/23年7月变更.sql                            |  4 ++-
 .../com/jero/config/AutoPoiDictConfig.java    |  4 ++-
 .../impl/PayCompanyManagementServiceImpl.java |  5 ++--
 .../impl/PayMeetingSituationServiceImpl.java  |  9 +++++++
 .../vo/excel/InternationalSituationExcel.java |  4 ---
 .../meeting/vo/excel/SituationBaseExcel.java  | 26 +++++++++++++++++++
 6 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql
index d6688f65..be52f652 100644
--- a/db/23年7月变更.sql
+++ b/db/23年7月变更.sql
@@ -38,4 +38,6 @@ ALTER TABLE pay_meeting_situation
     ADD COLUMN opening_bank varchar(50) NULL COMMENT '开户行',
     ADD COLUMN bank_account varchar(50) NULL COMMENT '银行账号',
     ADD COLUMN duty_code varchar(50) NULL COMMENT '信用代码',
-    ADD COLUMN link_bank_number varchar(50) NULL COMMENT '联行号';
\ No newline at end of file
+    ADD COLUMN link_bank_number varchar(50) NULL COMMENT '联行号';
+ALTER TABLE pay_meeting_situation
+    ADD COLUMN invoice_project tinyint(4) NULL COMMENT '发票项目';
diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java
index 52608ae0..2b29b1ee 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java
@@ -57,7 +57,9 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI {
 			}
 		}
 		if (dictReplaces != null && dictReplaces.size() != 0) {
-			log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString());
+			if (oConvertUtils.isEmpty(dicTable)) {
+				log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString());
+			}
 			return dictReplaces.toArray(new String[dictReplaces.size()]);
 		}
 		return null;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
index 0d96e4bd..5c3a398b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.common.ProjectCommon;
 import com.jero.common.common.RoleCommon;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.ManagementMessageEnums;
@@ -454,9 +455,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         ValidUtil.validate(updateInvoicePram);
 
         //普通发票
-        if (Objects.equals(needInvoice, 1)) {
+        if (Objects.equals(needInvoice, ProjectCommon.NEED_INVOICE1)) {
             ValidUtil.validate(updateInvoicePram, UpdateInvoicePram.needInvoice_1.class);
-        } else if (Objects.equals(needInvoice, 2)) {
+        } else if (Objects.equals(needInvoice, ProjectCommon.NEED_INVOICE2)) {
             ValidUtil.validate(updateInvoicePram, UpdateInvoicePram.needInvoice_2.class);
         } else {
             throw new JeroBootException("需要发票才可变更");
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 6dcaa4a2..7cf1187b 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
@@ -35,6 +35,7 @@ import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.IPayContactsManagementService;
+import com.jero.company.vo.UpdateInvoicePram;
 import com.jero.config.StaticConfig;
 import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.contract.entity.PayIncomeContract;
@@ -1180,6 +1181,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             if (ProjectCommon.NEED_INVOICE1.equals(needInvoice)
                     ||ProjectCommon.NEED_INVOICE2.equals(needInvoice)) {
                 ValidUtil.validate(commonPeopleVO, NotPack.class);
+            //    校验发票信息
+                UpdateInvoicePram updateInvoicePram = new UpdateInvoicePram();
+                BeanUtils.copyProperties(payMeetingSituation, updateInvoicePram);
+                if (Objects.equals(needInvoice, ProjectCommon.NEED_INVOICE1)) {
+                    ValidUtil.validate(updateInvoicePram, UpdateInvoicePram.needInvoice_1.class);
+                } else {
+                    ValidUtil.validate(updateInvoicePram, UpdateInvoicePram.needInvoice_2.class);
+                }
             }
             String paymentRecord = payMeetingSituation.getPaymentRecord();
             String orderCode = payMeetingSituation.getOrderCode();
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 bf590429..7ca1141c 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
@@ -112,10 +112,6 @@ public class InternationalSituationExcel extends SituationBaseExcel {
     @Excel(name = "同行人", width = 15)
     private String peer;
 
-    /**备注*/
-    @Excel(name = "备注", width = 15)
-    private String remark;
-
     /**邮寄联系人*/
     @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id")
     private String postContactId;
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 dacea60c..00d289d0 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
@@ -12,4 +12,30 @@ public class SituationBaseExcel {
     /**签到文件*/
     @Excel(name = "手动签到", type = 2 ,width = 40 , height = 20,imageType = 3)
     private String checkFile;
+
+    /**发票项目*/
+    @Excel(name = "发票项目", dicCode = "invoice_project", width = 15)
+    private Integer invoiceProject;
+    /**信用代码*/
+    @Excel(name = "信用代码", width = 15)
+    private String dutyCode;
+    /**公司地址*/
+    @Excel(name = "公司地址", width = 15)
+    private String companyAddress;
+    /**公司电话*/
+    @Excel(name = "公司电话", width = 15)
+    private String companyPhone;
+    /**开户行*/
+    @Excel(name = "开户行", width = 15)
+    private String openingBank;
+    /**银行账号*/
+    @Excel(name = "银行账号", width = 15)
+    private String bankAccount;
+    /**联行号*/
+    @Excel(name = "联行号", width = 15)
+    private String linkBankNumber;
+
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    private String remark;
 }