Commit dd1c75c79052c69c89ef2b045e12740f3ea5d4e3

Authored by 王富生
1 parent f40903df

优化

urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
... ... @@ -57,6 +57,8 @@
57 57 </when>
58 58 <when test="req.finishState == 4">
59 59 AND b.finish_state = 4
  60 + <![CDATA[AND b.begin_time <= #{req.localDateTime}
  61 + AND b.end_time >= #{req.localDateTime}]]>
60 62 </when>
61 63 </choose>
62 64 </select>
... ...
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
... ... @@ -64,6 +64,8 @@
64 64 </if>
65 65 <if test="req.finishState == 4">
66 66 AND b.finish_state = 4
  67 + <![CDATA[AND b.begin_time <= #{req.localDateTime}
  68 + AND b.end_time >= #{req.localDateTime}]]>
67 69 </if>
68 70 ORDER BY b.id desc
69 71 </select>
... ...
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
... ... @@ -66,6 +66,8 @@
66 66 </when>
67 67 <when test="req.finishState == 4">
68 68 AND b.finish_state = 4
  69 + <![CDATA[AND b.begin_time <= #{req.localDateTime}
  70 + AND b.end_time >= #{req.localDateTime}]]>
69 71 </when>
70 72 </choose>
71 73 ORDER BY b.id desc
... ... @@ -124,6 +126,8 @@
124 126 </if>
125 127 <if test="req.finishState == 4">
126 128 and a.finish_state = 4
  129 + <![CDATA[and c.begin_time <= #{req.localDateTime}
  130 + and c.end_time >= #{req.localDateTime}]]>
127 131 </if>
128 132 ORDER BY a.id desc
129 133 </select>
... ...