From a3f46ff0f11503393952f4c9e390a0e505867525 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 9 Jul 2024 10:47:33 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E4=BC=81=E4=B8=9A=E7=AB=AF-=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=20=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9EsubitemId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/functionalsafetycenter/entity/SafetyCenter.java   | 7 +++++++
 .../mapper/xml/SafetyCenterMapper.xml                      | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java
index 2b657054..db74c077 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java
@@ -117,4 +117,11 @@ public class SafetyCenter {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+
+    /**
+     * 成员id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="成员id")
+    private String subitemId;
 }
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml
index f2511327..903452f1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml
@@ -22,8 +22,8 @@
     remarks, create_by, create_time, update_by, update_time
   </sql>
 
-  <select id="queryCompanyPageList" resultMap="BaseResultMap">
-    select *
+  <select id="queryCompanyPageList" resultType="com.jero.functionalsafetycenter.entity.SafetyCenter">
+    select pfsc.*,pfscs.id as subitem_id
     from pay_functional_safety_center pfsc
            left join pay_functional_safety_center_subitem pfscs on pfsc.id = pfscs.project_id
            left join pay_functional_safety_center_subitem_contacts pfscsc on pfscs.id = pfscsc.subitem_id