From 5ec8062316441a92f1d9d904c04c623917f4aba9 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 30 Sep 2021 13:43:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingController.java      |   2 -
 .../com/jero/meeting/entity/PayMeeting.java   |   7 +-
 .../meeting/mapper/xml/PayMeetingMapper.xml   | 112 ++++++++++++------
 3 files changed, 80 insertions(+), 41 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index ab5cfacf..0efce32b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -198,8 +198,6 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
             LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
             meeting.setDirectorName(user.getUsername());
             meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
-            PayMeetingVO payMeetingVO = new PayMeetingVO();
-            BeanUtils.copyProperties(payMeetingVO, payMeeting);
         }
 
         return Result.OK(pageList);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
index 83855e5c..18adca2a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
@@ -89,7 +89,7 @@ public class PayMeeting implements Serializable {
     private String workingGroupName;
 
     /**分标委项目id*/
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "分标委项目id")
     private String caseCommitteeId;
 
     /**分标委名称*/
@@ -262,4 +262,9 @@ public class PayMeeting implements Serializable {
     @TableField(exist = false)
     @Dict(dicCode = "meeting_status")
     private Integer meetingStatus;
+    /**
+     * 会议成员id
+     */
+    @TableField(exist = false)
+    private String situationId;
 }
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 ac7930d4..1c489c71 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
@@ -2,49 +2,85 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.meeting.mapper.PayMeetingMapper">
     <resultMap id="PayMeetingResultMap" type="com.jero.meeting.entity.PayMeeting">
-        <id column="id" property="id" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="meeting_name" property="meetingName" />
-        <result column="meeting_type" property="meetingType" />
-        <result column="tb_meeting_type" property="tbMeetingType" />
-        <result column="working_group_id" property="workingGroupId" />
-        <result column="working_group_name" property="workingGroupName" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="particular_year" property="particularYear" />
-        <result column="start_sign_in_time" property="startSignInTime" />
-        <result column="end_sign_in_time" property="endSignInTime" />
-        <result column="venue" property="venue" />
-        <result column="address" property="address" />
-        <result column="estimated_number" property="estimatedNumber" />
-        <result column="meeting_content" property="meetingContent" />
-        <result column="meeting_costs" property="meetingCosts" />
-        <result column="meeting_costs_vip" property="meetingCostsVip" />
-        <result column="director_id" property="directorId" />
-        <result column="director_name" property="directorName" />
-        <result column="director_phone" property="directorPhone" />
-        <result column="hotel_name" property="hotelName" />
-        <result column="hotel_address" property="hotelAddress" />
-        <result column="hotel_contacts" property="hotelContacts" />
-        <result column="remark" property="remark" />
+        <id column="id" property="id"/>
+        <result column="create_by" property="createBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="meeting_name" property="meetingName"/>
+        <result column="meeting_type" property="meetingType"/>
+        <result column="tb_meeting_type" property="tbMeetingType"/>
+        <result column="working_group_id" property="workingGroupId"/>
+        <result column="working_group_name" property="workingGroupName"/>
+        <result column="start_time" property="startTime"/>
+        <result column="end_time" property="endTime"/>
+        <result column="particular_year" property="particularYear"/>
+        <result column="start_sign_in_time" property="startSignInTime"/>
+        <result column="end_sign_in_time" property="endSignInTime"/>
+        <result column="venue" property="venue"/>
+        <result column="address" property="address"/>
+        <result column="estimated_number" property="estimatedNumber"/>
+        <result column="meeting_content" property="meetingContent"/>
+        <result column="meeting_costs" property="meetingCosts"/>
+        <result column="meeting_costs_vip" property="meetingCostsVip"/>
+        <result column="director_id" property="directorId"/>
+        <result column="director_name" property="directorName"/>
+        <result column="director_phone" property="directorPhone"/>
+        <result column="hotel_name" property="hotelName"/>
+        <result column="hotel_address" property="hotelAddress"/>
+        <result column="hotel_contacts" property="hotelContacts"/>
+        <result column="remark" property="remark"/>
         <result column="pay_mode" property="payMode"/>
         <result column="meetingStatus" property="meetingStatus"/>
     </resultMap>
 
     <select id="pageListContract" resultMap="PayMeetingResultMap">
-        select pm.*,pms.pay_mode,
-        (case when date_format(start_time,'%Y-%m-%d') > #{now} then 2
-        when date_format(start_time,'%Y-%m-%d') <![CDATA[<=]]> #{now}
-            and #{now} <![CDATA[<=]]> date_format(end_time,'%Y-%m-%d') then 3
-        when date_format(end_time,'%Y-%m-%d') <![CDATA[<=]]> #{now} then 4
-        END
-        ) as meetingStatus
+        select meeting_name,
+               meeting_type,
+               tb_meeting_type,
+               working_group_id,
+               working_group_name,
+               start_time,
+               end_time,
+               particular_year,
+               start_sign_in_time,
+               end_sign_in_time,
+               venue,
+               convoke_locale,
+               address,
+               estimated_number,
+               meeting_content,
+               register_deadline,
+               vip_invitation_code,
+               speaker_invitation_code,
+               guest_invitation_code,
+               cooperative_invitation_code,
+               meeting_costs,
+               meeting_costs_vip,
+               director_id,
+               director_name,
+               director_phone,
+               hotel_name,
+               hotel_address,
+               meeting_files,
+               meeting_data,
+               remind,
+               payment_qr_code,
+               case_committee_id,
+               case_committee_name,
+               notice,
+               pms.pay_mode,
+               pms.id,
+               (case
+                       when date_format(start_time, '%Y-%m-%d') > #{now} then 2
+                       when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}
+                               and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3
+                       when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4
+                       END
+                       ) as meetingStatus
         from pay_meeting pm
-            left join pay_meeting_situation pms on pm.id = pms.meeting_id
-            left join pay_meeting_remind_record pmrr on pm.id = pmrr.meeting_id
-        ${ew.customSqlSegment}
+                     left join pay_meeting_situation pms on pm.id = pms.meeting_id
+                     left join pay_meeting_remind_record pmrr on pm.id = pmrr.meeting_id
+                ${ew.customSqlSegment}
     </select>
 </mapper>
\ No newline at end of file