From a0f49470fb76d10e4cc8b175e3c06c6e897bf765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Fri, 15 Oct 2021 09:22:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8E=9F=E6=9C=89id=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AEid,=20=E6=96=B0=E5=A2=9EsituationId=20?=
 =?UTF-8?q?=E4=B8=BA=E6=88=90=E5=91=98id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
index 29400615..9031590c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
@@ -3,6 +3,7 @@
 <mapper namespace="com.jero.meeting.mapper.PayMeetingMapper">
     <resultMap id="PayMeetingResultMap" type="com.jero.meeting.entity.PayMeeting">
         <id column="id" property="id"/>
+        <id column="situationId" property="situationId"/>
         <result column="create_by" property="createBy"/>
         <result column="create_time" property="createTime"/>
         <result column="update_by" property="updateBy"/>
@@ -33,7 +34,7 @@
         <result column="pay_mode" property="payMode"/>
         <result column="meetingStatus" property="meetingStatus"/>
     </resultMap>
-
+    <!--  将原有id改为会议id, 新增situationId 为成员id  -->
     <select id="pageListContract" resultMap="PayMeetingResultMap">
         select distinct meeting_name,
                meeting_type,
@@ -70,7 +71,8 @@
                case_committee_name,
                notice,
                pms.pay_mode,
-               pms.id,
+               pms.id as situationId,
+               pm.id as id
                (case
                        when date_format(start_time, '%Y-%m-%d') > #{now} then 2
                        when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}