From da49967d83ccfb984025000c3b4caae659735b00 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 8 Jul 2024 14:11:24 +0800
Subject: [PATCH] =?UTF-8?q?fix=2086915=20=E5=8A=9F=E8=83=BD=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E6=88=90=E5=91=98=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4-=E5=AF=BC=E5=85=A5-=E6=8C=89=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SafetyCenterSubitemController.java               | 2 +-
 .../service/SafetyCenterSubitemService.java                     | 1 +
 .../functionalsafetycenter/vo/SafetyCenterSubitemImport.java    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java
index 9da47bfd..3de1a93b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java
@@ -246,7 +246,7 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
         }
         safetyCenterSubitemService.importExcelData(projectId,excelData);
 
-        return super.importExcel(request, response, SafetyCenterSubitem.class);
+        return Result.OK("导入成功");
     }
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
index 412bdb5a..350c4c07 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
@@ -354,6 +354,7 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
                 }
                 SafetyCenterSubitemContacts contacts1 = new SafetyCenterSubitemContacts();
                 contacts1.setContactsId(payContactsManagement.getId());
+                contacts1.setRemarks(contactsImport.getRemarks());
                 subitemContactsList.add(contacts1);
             }
             if (!errorMessage.isEmpty()){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java
index 52bc5e97..883d80df 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java
@@ -34,6 +34,7 @@ public class SafetyCenterSubitemImport {
      * 备注
      */
     @ApiModelProperty(value = "备注")
+    @Excel(name = "备注")
     private String remarks;
 
 }
\ No newline at end of file