Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

This commit is contained in:
pserimal
2023-06-25 15:05:53 +08:00
6 changed files with 60 additions and 37 deletions

View File

@@ -203,16 +203,16 @@
set room_status = #{roomStatus},update_time = now()
<where>
<if test="record.roomStatus !=null and record.roomStatus!=''">
and hpip.room_status = #{record.roomStatus}
and room_status = #{record.roomStatus}
</if>
<if test="record.startTime !=null and record.startTime!=''">
and hpip.start_time &gt;= #{record.startTime}
<if test="record.startTime !=null'">
and start_time &gt;= #{record.startTime}
</if>
<if test="record.endTime !=null and record.endTime!=''">
and hpip.end_time &lt;= #{record.endTime}
<if test="record.endTime !=null">
and end_time &lt;= #{record.endTime}
</if>
<if test="record.deleted !=null and record.deleted!=''">
and hpip.deleted = #{deleted}
and deleted = #{deleted}
</if>
</where>
</update>
@@ -222,16 +222,16 @@
set room_status = #{roomStatus},update_time = now()
<where>
<if test="record.roomStatus !=null and record.roomStatus!=''">
and hpip.room_status = #{record.roomStatus}
and room_status = #{record.roomStatus}
</if>
<if test="record.startTime !=null and record.startTime!=''">
and hpip.start_time &gt;= #{record.startTime}
<if test="record.startTime !=null">
and start_time &gt;= #{record.startTime}
</if>
<if test="record.endTime !=null and record.endTime!=''">
and hpip.start_time &lt;= #{record.endTime}
<if test="record.endTime !=null">
and start_time &lt;= #{record.endTime}
</if>
<if test="record.deleted !=null and record.deleted!=''">
and hpip.deleted = #{deleted}
and deleted = #{deleted}
</if>
</where>
</update>
@@ -241,16 +241,16 @@
set room_status = #{roomStatus},update_time = now()
<where>
<if test="record.roomStatus !=null and record.roomStatus!=''">
and hpip.room_status = #{record.roomStatus}
and room_status = #{record.roomStatus}
</if>
<if test="record.startTime !=null and record.startTime!=''">
and hpip.end_time &gt;= #{record.startTime}
<if test="record.startTime !=null">
and end_time &gt;= #{record.startTime}
</if>
<if test="record.endTime !=null and record.endTime!=''">
and hpip.end_time &lt;= #{record.endTime}
<if test="record.endTime !=null">
and end_time &lt;= #{record.endTime}
</if>
<if test="record.deleted !=null and record.deleted!=''">
and hpip.deleted = #{deleted}
and deleted = #{deleted}
</if>
</where>
</update>
@@ -362,10 +362,10 @@
<if test="record.roomStatus !=null">
and hpip.room_status = #{record.roomStatus}
</if>
<if test="record.startTime !=null and record.startTime!=''">
<if test="record.startTime !=null">
and hpip.start_time &gt;= #{record.startTime}
</if>
<if test="record.endTime !=null and record.endTime!=''">
<if test="record.endTime !=null">
and hpip.end_time &lt;= #{record.endTime}
</if>
<if test="record.deleted !=null and record.deleted!=''">
@@ -424,10 +424,10 @@
<if test="record.partnerId !=null and record.partnerId!=''">
and partner_id = #{record.partnerId}
</if>
<if test="record.startTime !=null and record.startTime!=''">
<if test="record.startTime !=null">
and start_time = #{record.startTime}
</if>
<if test="record.endTime !=null and record.endTime!=''">
<if test="record.endTime !=null">
and end_time = #{record.endTime}
</if>
<if test="record.interviewer !=null and record.interviewer!=''">