From 1b2fd9a825a7139a15a7000a70b683e727f7046b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 5 Mar 2024 11:05:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D/=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E5=A2=9E=E5=8A=A0=E2=80=9C=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E4=BC=81=E4=B8=9A=E2=80=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayCompanyManagementController.java           | 15 +++++++++++++++
 .../jero/company/entity/PayCompanyManagement.java |  5 +++++
 2 files changed, 20 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
index 8f9f0f1c..c71bfd73 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
@@ -806,6 +806,11 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 				}else if("false".equals(p.getInternalEnterprise())){
 					p.setInternalEnterprise("否");
 				}
+				if("true".equals(p.getPackageEnterprise())){
+					p.setPackageEnterprise("是");
+				}else if("false".equals(p.getPackageEnterprise())){
+					p.setInternalEnterprise("否");
+				}
 			});
 		}
 		// Step.3 AutoPoi 导出Excel
@@ -923,6 +928,16 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 							}
 						}
 
+						if (!StringUtils.isBlank(p.getPackageEnterprise())){
+							if("是".equals(p.getPackageEnterprise())){
+								p.setPackageEnterprise("true");
+							}else if("否".equals(p.getPackageEnterprise())){
+								p.setPackageEnterprise("false");
+							}else{
+								msg.append("第").append(count + 3).append("行:是否打包企业,只能输入是或否，请修改。<br/>");
+							}
+						}
+
 						// 校验 表中是否存在企业名称
 						if(!CollectionUtils.isEmpty(listCompanyAll)){
 							List<PayCompanyManagement> listCompanyEquals = listCompanyAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
index 085b2db8..53486cd0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
@@ -143,6 +143,11 @@ public class PayCompanyManagement implements Serializable {
     @Size(max = 6, message = "是否内部企业长度不能大于6个字符")
     private String internalEnterprise;
 
+    @Excel(name = "是否打包企业", width = 15)
+    @ApiModelProperty(value = "是否打包企业")
+    @Size(max = 6, message = "是否打包企业长度不能大于6个字符")
+    private String packageEnterprise;
+
     /**联行号*/
     @Excel(name = "联行号", width = 15)
     @ApiModelProperty(value = "联行号")