wuxw пре 3 година
родитељ
комит
9be550ac95

BIN
java110-db/src/main/resources/mapper/.DS_Store


+ 9 - 1
java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml

@@ -211,8 +211,12 @@
         <if test="nowTime != null">
             and t.create_time &lt; #{nowTime}
         </if>
+        <!--<if test="qrCodeTime != null">-->
+            <!--and t.create_time &gt; #{qrCodeTime}-->
+        <!--</if>-->
         <if test="qrCodeTime != null">
-            and t.create_time &gt; #{qrCodeTime}
+            and it.plan_ins_time &lt; #{qrCodeTime}
+            and it.plan_end_time &gt; #{qrCodeTime}
         </if>
         <if test="inspectionStartTime !=null and inspectionStartTime != ''">
             and t.inspection_time &gt;= #{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 &lt; #{qrCodeTime}
+            and it.plan_end_time &gt; #{qrCodeTime}
+        </if>
         <if test="inspectionStartTime !=null and inspectionStartTime != ''">
             and t.inspection_time &gt;= #{inspectionStartTime}
         </if>