From 40fd833cd96090ed55a8133569d3caaea4af2804 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 18 Oct 2021 11:44:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2040726=20=E4=BC=9A=E5=91=98=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE-=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=88=90=E5=91=98=E9=A1=B5=E9=9D=A2-=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=A8=A1=E6=9D=BF=E6=9C=89=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMemberProjectSubitemController.java       | 6 +++++-
 .../com/jero/member/entity/PayMemberProjectSubitem.java     | 4 ++--
 .../com/jero/member/vo/PayMemberProjectSubitemExcel.java    | 3 ---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
index 9b979232..307a91eb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
@@ -198,7 +198,10 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     @ApiOperation(value = "会员项目成员表-导入数据", notes = "会员项目成员表-通过id查询")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        request.getParameter("");
+        String projectId = request.getParameter("projectId");
+        if (StringUtils.isBlank(projectId)) {
+            throw new JeroBootException("项目id为空");
+        }
         List<Object> excelData = super.getExcelData(request, PayMemberProjectSubitemExcel.class);
         if (excelData.isEmpty()) {
             throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
@@ -209,6 +212,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             errorRowNum += 1;
             //复制属性
             PayMemberProjectSubitemExcel projectSubitemExcel = (PayMemberProjectSubitemExcel) obj;
+            projectSubitemExcel.setProjectId(projectId);
             PayMemberProjectSubitem projectSubitem = new PayMemberProjectSubitem();
 
             //应收金额
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
index 24ae6073..952604bf 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
@@ -77,7 +77,7 @@ public class PayMemberProjectSubitem implements Serializable {
     /**
      * 会员项目id
      */
-    @Excel(name = "会员项目名称", width = 15, dictTable = "pay_member_project", dicText = "project_name", dicCode = "id")
+    //@Excel(name = "会员项目名称", width = 15, dictTable = "pay_member_project", dicText = "project_name", dicCode = "id")
     @ApiModelProperty(value = "会员项目id")
     @NotBlank(message = "会员项目不能为空")
     @Size(max = 50, message = "会员项目最大为50字符")
@@ -242,7 +242,7 @@ public class PayMemberProjectSubitem implements Serializable {
     private Integer mail;
 
     /**开票金额*/
-    @Excel(name = "开票金额", width = 15)
+    //@Excel(name = "开票金额", width = 15)
     @ApiModelProperty(value = "开票金额")
     @DecimalMax(value = "9999999999.99",message = "开票金额格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java
index 1ccf41a8..9344a050 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java
@@ -25,10 +25,7 @@ public class PayMemberProjectSubitemExcel {
     /**
      * 会员项目id
      */
-    @Excel(name = "会员项目名称", width = 15, dictTable = "pay_member_project", dicText = "project_name", dicCode = "id")
     @ApiModelProperty(value = "会员项目id")
-    @NotBlank(message = "会员项目不能为空")
-    @Size(max = 50, message = "会员项目最大为50字符")
     private String projectId;
 
     /**