diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml index 09e4324..2e7bf72 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml @@ -47,21 +47,21 @@ - AND b.finish_state = 1 + AND a.finish_state = 1 = #{req.localDateTime}]]> - AND b.finish_state = 2 + AND a.finish_state = 2 - AND b.finish_state = 3 + AND a.finish_state = 3 = #{req.localDateTime}]]> - AND b.finish_state = 4 + AND a.finish_state = 4 = #{req.localDateTime}]]> @@ -108,22 +108,22 @@ - and c.finish_state =a.finish_state + -- and c.finish_state =a.finish_state - and a.finish_state = 1 + and c.finish_state = 1 = #{req.localDateTime}]]> - and a.finish_state = 2 + and c.finish_state = 2 - and a.finish_state = 3 + and c.finish_state = 3 = #{req.localDateTime}]]> - and a.finish_state = 4 + and c.finish_state = 4 = #{req.localDateTime}]]> diff --git a/urbanops-server/src/main/resources/application.yaml b/urbanops-server/src/main/resources/application.yaml index d67b2e4..2cfeef0 100644 --- a/urbanops-server/src/main/resources/application.yaml +++ b/urbanops-server/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: name: urbanops-server profiles: - active: dev + active: prod main: allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。