BJ_FS / urbanops

Commit dd1c75c79052c69c89ef2b045e12740f3ea5d4e3

Authored by 王富生
1 parent f40903df

优化

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