fix 47074 企业端--会议--查询进行中的会议--出现了已结束的会议

This commit is contained in:
lijiarao
2022-01-10 15:06:02 +08:00
parent 8e8a900cdd
commit 65f8dc99b6
@@ -77,10 +77,10 @@
pm.create_time as create_time, pm.create_time as create_time,
GROUP_CONCAT(pms.company_contact_id) company_contact_ids, GROUP_CONCAT(pms.company_contact_id) company_contact_ids,
(case (case
when date_format(start_time, '%Y-%m-%d') > #{now} then 2 when start_time > #{now} then 2
when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} when start_time <![CDATA[<=]]> #{now}
and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3 and #{now} <![CDATA[<=]]> end_time then 3
when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4 when end_time <![CDATA[<]]> #{now} then 4
END END
) as meetingStatus ) as meetingStatus
from pay_meeting pm from pay_meeting pm
@@ -132,10 +132,10 @@
pm.id, pm.id,
pm.create_time as create_time, pm.create_time as create_time,
(case (case
when date_format(start_time, '%Y-%m-%d') > #{now} then 2 when start_time > #{now} then 2
when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} when start_time <![CDATA[<=]]> #{now}
and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3 and #{now} <![CDATA[<=]]> end_time then 3
when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4 when end_time <![CDATA[<]]> #{now} then 4
END END
) as meetingStatus ) as meetingStatus
from pay_meeting pm from pay_meeting pm
@@ -148,10 +148,10 @@
<select id="pageListContract3" resultMap="PayMeetingResultMap"> <select id="pageListContract3" resultMap="PayMeetingResultMap">
SELECT *, SELECT *,
(case (case
when date_format(start_time, '%Y-%m-%d') > #{now} then 2 when start_time > #{now} then 2
when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} when start_time <![CDATA[<=]]> #{now}
and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3 and #{now} <![CDATA[<=]]> end_time then 3
when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4 when end_time <![CDATA[<]]> #{now} then 4
END END
) as meetingStatus ) as meetingStatus
FROM ( FROM (
@@ -238,10 +238,10 @@
<select id="queryByIdAndTime" resultMap="PayMeetingResultMap"> <select id="queryByIdAndTime" resultMap="PayMeetingResultMap">
select *, select *,
(case (case
when date_format(start_time, '%Y-%m-%d') > #{now} then 2 when start_time > #{now} then 2
when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} when start_time <![CDATA[<=]]> #{now}
and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3 and #{now} <![CDATA[<=]]> end_time then 3
when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4 when end_time <![CDATA[<]]> #{now} then 4
END END
) as meetingStatus ) as meetingStatus
from pay_meeting pm where id = #{id} from pay_meeting pm where id = #{id}