|
@@ -337,12 +337,14 @@ public class ApiConstants {
|
|
|
}
|
|
|
|
|
|
public interface Maintenance {
|
|
|
- Integer WAITING_MAINTENANCE = 0;
|
|
|
- Integer MAINTENANCE_DOING = 2;
|
|
|
- Integer COMPLETE = 1;
|
|
|
- Integer OVERDUE = -1;
|
|
|
+ Integer WAITING_MAINTENANCE = 0;//待保养
|
|
|
+ Integer MAINTENANCE_DOING = 2;//保养中
|
|
|
+ Integer COMPLETE = 1;//已完成
|
|
|
+ Integer OVERDUE = -1;//超期
|
|
|
+ Integer LAWS_STIPULATION_OVERDUE = 10;//自定义的法规超期,非数据库状态
|
|
|
}
|
|
|
|
|
|
+ //根据用户id和维保计划时间和状态查询用户那一天的各种类型维保任务(待保养/保养中/已完成/计划超期)
|
|
|
public interface SQL {
|
|
|
String QUERY_MAINTENANCE_PLAN_EVERYDAY =
|
|
|
"select p.project_name projectName," +
|
|
@@ -351,35 +353,31 @@ public class ApiConstants {
|
|
|
" l.lift_type liftType," +
|
|
|
" l.category category," +
|
|
|
" ui.name workerName," +
|
|
|
- " mp.plan_date planDate," +
|
|
|
+ " mp.plan_date planDate" +
|
|
|
" from maintenance_plan mp" +
|
|
|
" left join lift l on mp.lift_id = l.id" +
|
|
|
" left join user_info ui on mp.worker_id = ui.user_id" +
|
|
|
- " left join project p on p.id in (select project_id from project_user where user_id = #{userId})" +
|
|
|
+ " left join project p on mp.project_id = p.id" +
|
|
|
" where mp.plan_date = #{planDate}" +
|
|
|
- " and mp.status = #{status}";
|
|
|
+ " and mp.status = #{status}" +
|
|
|
+ " and mp.project_id in (select project_id from project_user where user_id = #{userId})";
|
|
|
|
|
|
- String SELECT_COUNT_FROM_TABLE = "select count(*) from #{table} where ${condition}";
|
|
|
-
|
|
|
- String QUERY_MAINTENANCE_MONTH =
|
|
|
- "select p.project_name projectName," +
|
|
|
+ String QUERY_MAINTENANCE_PLAN_EVERYDAY_OVERDUE =
|
|
|
+ "select mp.status planStatus," +
|
|
|
+ " l.id liftId," +
|
|
|
+ " p.project_name projectName," +
|
|
|
" l.registration_code registrationCode," +
|
|
|
- " l.device_position devicePosition," +
|
|
|
- " l.lift_type liftType," +
|
|
|
- " l.category category," +
|
|
|
- " ui.name workerName," +
|
|
|
- " mp.plan_date planDate," +
|
|
|
- " from maintenance_plan mp" +
|
|
|
+ " l.device_position devicePosition," +
|
|
|
+ " l.lift_type liftType," +
|
|
|
+ " l.category category," +
|
|
|
+ " ui.name name" +
|
|
|
+ " from maintenance_plan mp" +
|
|
|
" left join lift l on mp.lift_id = l.id" +
|
|
|
- " left join project_lift_relevance plr" +
|
|
|
- " on l.id = plr.lift_id" +
|
|
|
- " and plr.project_id in (select project_id" +
|
|
|
- " from project_user" +
|
|
|
- " where user_id = #{userId})" +
|
|
|
+ " left join user_info ui on mp.worker_id = ui.user_id" +
|
|
|
" left join project p on mp.project_id = p.id" +
|
|
|
- " left join user_info ui on ui.user_id = mp.worker_id" +
|
|
|
- " where DATE_FORMAT(mp.plan_date, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')" +
|
|
|
- " and mp.status = '1' order by mp.plan_date";
|
|
|
+ " where plan_date = #{planDate}" +
|
|
|
+ " and TimeStampDiff(DAY, DATE_FORMAT(plan_date, '%Y%m%d'), DATE_FORMAT(work_date, '%Y%m%d')) > 15" +
|
|
|
+ " and mp.project_id in (select project_id from project_user where user_id = #{userId})";
|
|
|
|
|
|
//扫码,查询电梯信息
|
|
|
String QUERY_LIFT_INFO_BY_LIFT_ID =
|
|
@@ -419,10 +417,10 @@ public class ApiConstants {
|
|
|
|
|
|
//物管,根据用户id和月份,查询那一月每天的(待保养/保养中/已完成/计划超期/法规超期)的数量
|
|
|
String QUERY_MAINTENANCE_PLAN_MONTH_TASK_NUM =
|
|
|
- "select DATE_FORMAT(plan_date, '%d') day, status, count(status) count" +
|
|
|
+ "select DATE_FORMAT(plan_date, '%d') day, status status, count(status) count" +
|
|
|
" from maintenance_plan" +
|
|
|
" where project_id in (select project_id from project_user where user_id = #{userId})" +
|
|
|
- " and DATE_FORMAT(plan_date, '%Y%m') = #{yearMonth}" +
|
|
|
+ " and DATE_FORMAT(plan_date, '%Y-%m') = #{yearMonth}" +
|
|
|
" group by plan_date, status";
|
|
|
}
|
|
|
}
|