|
|
@@ -211,8 +211,12 @@
|
|
|
<if test="nowTime != null">
|
|
|
and t.create_time < #{nowTime}
|
|
|
</if>
|
|
|
+ <!--<if test="qrCodeTime != null">-->
|
|
|
+ <!--and t.create_time > #{qrCodeTime}-->
|
|
|
+ <!--</if>-->
|
|
|
<if test="qrCodeTime != null">
|
|
|
- and t.create_time > #{qrCodeTime}
|
|
|
+ and it.plan_ins_time < #{qrCodeTime}
|
|
|
+ and it.plan_end_time > #{qrCodeTime}
|
|
|
</if>
|
|
|
<if test="inspectionStartTime !=null and inspectionStartTime != ''">
|
|
|
and t.inspection_time >= #{inspectionStartTime}
|
|
|
@@ -367,6 +371,10 @@
|
|
|
<if test="inspectionId !=null and inspectionId != ''">
|
|
|
and t.inspection_id= #{inspectionId}
|
|
|
</if>
|
|
|
+ <if test="qrCodeTime != null">
|
|
|
+ and it.plan_ins_time < #{qrCodeTime}
|
|
|
+ and it.plan_end_time > #{qrCodeTime}
|
|
|
+ </if>
|
|
|
<if test="inspectionStartTime !=null and inspectionStartTime != ''">
|
|
|
and t.inspection_time >= #{inspectionStartTime}
|
|
|
</if>
|