BJ_FS / urbanops

Commit 8fc67012b5d98abab2822359023f8a52e8e0f0e7

Authored by 颜惠青
2 parents a83fd943 833dcd73

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
  View file @8fc6701
... ... @@ -47,21 +47,21 @@
47 47 <!-- 状态过滤 -->
48 48 <choose>
49 49 <when test="req.finishState == 1">
50   - AND b.finish_state = 1
  50 + AND a.finish_state = 1
51 51 <![CDATA[AND b.begin_time <= #{req.localDateTime}
52 52 AND b.end_time >= #{req.localDateTime}]]>
53 53 </when>
54 54 <when test="req.finishState == 2">
55   - AND b.finish_state = 2
  55 + AND a.finish_state = 2
56 56  
57 57 </when>
58 58 <when test="req.finishState == 3">
59   - AND b.finish_state = 3
  59 + AND a.finish_state = 3
60 60 <![CDATA[AND b.begin_time <= #{req.localDateTime}
61 61 AND b.end_time >= #{req.localDateTime}]]>
62 62 </when>
63 63 <when test="req.finishState == 4">
64   - AND b.finish_state = 4
  64 + AND a.finish_state = 4
65 65 <![CDATA[AND b.begin_time <= #{req.localDateTime}
66 66 AND b.end_time >= #{req.localDateTime}]]>
67 67 </when>
... ... @@ -108,22 +108,22 @@
108 108 </foreach>
109 109 </if>
110 110 <!--状态 1:未完成;2:已完成;3:已失效-->
111   - and c.finish_state =a.finish_state
  111 + -- and c.finish_state =a.finish_state
112 112 <if test="req.finishState == 1">
113   - and a.finish_state = 1
  113 + and c.finish_state = 1
114 114 <![CDATA[and c.begin_time <= #{req.localDateTime}
115 115 and c.end_time >= #{req.localDateTime}]]>
116 116 </if>
117 117 <if test="req.finishState == 2">
118   - and a.finish_state = 2
  118 + and c.finish_state = 2
119 119 </if>
120 120 <if test="req.finishState == 3">
121   - and a.finish_state = 3
  121 + and c.finish_state = 3
122 122 <![CDATA[and c.begin_time <= #{req.localDateTime}
123 123 and c.end_time >= #{req.localDateTime}]]>
124 124 </if>
125 125 <if test="req.finishState == 4">
126   - and a.finish_state = 4
  126 + and c.finish_state = 4
127 127 <![CDATA[and c.begin_time <= #{req.localDateTime}
128 128 and c.end_time >= #{req.localDateTime}]]>
129 129 </if>
... ...
urbanops-server/src/main/resources/application.yaml
  View file @8fc6701
... ... @@ -3,7 +3,7 @@ spring:
3 3 name: urbanops-server
4 4  
5 5 profiles:
6   - active: dev
  6 + active: prod
7 7  
8 8 main:
9 9 allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
... ...