add 参会人增加发票的字段

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 '联行号';
+    ADD COLUMN link_bank_number varchar(50) NULL COMMENT '联行号';
+ALTER TABLE pay_meeting_situation
+    ADD COLUMN invoice_project tinyint(4) NULL COMMENT '发票项目';

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;

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("需要发票才可变更");

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();

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;

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;
 }