BJ_FS / urbanops

Commit a5805f7061fd8a4d78c0d593c1b0ffdf2241d8a0

Authored by 王富生
1 parent dd1c75c7

优化

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