|
@@ -162,18 +162,15 @@
|
|
|
</if>
|
|
|
<if test="searchType != null and searchType != ''">
|
|
|
<if test="searchType == 'MUSIC_PATROL_ITEM'">
|
|
|
- AND iip.conclusion_status_ = 1 AND iip.memo_=''
|
|
|
+ AND iip.conclusion_status_ = 1 AND iip.memo_='' AND iip.plan_start_ >= #{searchStartTime}
|
|
|
</if>
|
|
|
<if test="searchType == 'INSPECTION_ITEM_PLAN'">
|
|
|
- AND iip.status_ = 0 AND iip.memo_ = '' AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') < DATE_FORMAT(NOW(),'%Y-%m-%d')
|
|
|
+ AND iip.status_ = 0 AND iip.memo_ = '' AND iip.plan_start_ >= #{searchStartTime} AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') < DATE_FORMAT(NOW(),'%Y-%m-%d')
|
|
|
</if>
|
|
|
</if>
|
|
|
<if test="startTime != null">
|
|
|
AND iip.plan_start_ >= #{startTime}
|
|
|
</if>
|
|
|
- <if test="searchStartTime != null and searchStartTime != ''">
|
|
|
- AND iip.plan_start_ >= #{searchStartTime}
|
|
|
- </if>
|
|
|
<if test="endTime != null">
|
|
|
<![CDATA[AND iip.plan_start_ <= #{endTime}]]>
|
|
|
</if>
|