Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
5ea65127 由 康伟
选项

kangwei: 水务公司生产运营工作进度统计功能开发-后端

1 个父辈 e8d2ae8c
内嵌 并排
正在显示 1 个修改的文件 包含 7 行增加 和 4 行删除
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/WorkAnalysisController.java
...@@ -31,7 +31,7 @@ import java.util.List; ...@@ -31,7 +31,7 @@ import java.util.List;
31 public class WorkAnalysisController { 31 public class WorkAnalysisController {
32 32
33 33
34 @ApiOperation(value = "工作进度统计", notes = "工作进度统计 timeType = 1 表示月份，timeType=2 表示年") 34 @ApiOperation(value = "工作进度列表", notes = "工作进度列表 timeType = 1 表示月份，timeType=2 表示年")
35 @GetMapping("/analysisByWorkProgress") 35 @GetMapping("/analysisByWorkProgress")
36 public Result<List<WorkProgressVO>> analysisByWorkProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) { 36 public Result<List<WorkProgressVO>> analysisByWorkProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
37 Result<List<WorkProgressVO>> result = new Result<>(); 37 Result<List<WorkProgressVO>> result = new Result<>();
...@@ -56,7 +56,7 @@ public class WorkAnalysisController { ...@@ -56,7 +56,7 @@ public class WorkAnalysisController {
56 return result; 56 return result;
57 } 57 }
58 58
59 @ApiOperation(value = "工作进度统计-数量", notes = "工作进度统计 timeType = 1 表示月份，timeType=2 表示年") 59 @ApiOperation(value = "工作进度统计-数量统计", notes = "工作进度-数量统计 timeType = 1 表示月份，timeType=2 表示年")
60 @GetMapping("/analysisTotalByWorkProgress") 60 @GetMapping("/analysisTotalByWorkProgress")
61 public Result<WorkProgressVO> analysisTotalByWorkProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) { 61 public Result<WorkProgressVO> analysisTotalByWorkProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
62 Result<WorkProgressVO> result = new Result<>(); 62 Result<WorkProgressVO> result = new Result<>();
...@@ -86,7 +86,7 @@ public class WorkAnalysisController { ...@@ -86,7 +86,7 @@ public class WorkAnalysisController {
86 } 86 }
87 87
88 88
89 @ApiOperation(value = "安全管理进度统计", notes = "安全管理进度统计 timeType = 1 表示月份，timeType=2 表示年") 89 @ApiOperation(value = "安全管理进度-数据列表", notes = "安全管理进度-数据列表 timeType = 1 表示月份，timeType=2 表示年")
90 @GetMapping("/analysisBySafeProgress") 90 @GetMapping("/analysisBySafeProgress")
91 public List<SafeProgressVO> analysisBySafeProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) { 91 public List<SafeProgressVO> analysisBySafeProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
92 JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master"); 92 JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master");
...@@ -105,7 +105,7 @@ public class WorkAnalysisController { ...@@ -105,7 +105,7 @@ public class WorkAnalysisController {
105 105
106 return dataList; 106 return dataList;
107 } 107 }
108 @ApiOperation(value = "安全管理进度统计-数量", notes = "安全管理进度统计 timeType = 1 表示月份，timeType=2 表示年") 108 @ApiOperation(value = "安全管理进度统计-数量统计", notes = "安全管理进度-数量统计 timeType = 1 表示月份，timeType=2 表示年")
109 @GetMapping("/analysisTotalBySafeProgress") 109 @GetMapping("/analysisTotalBySafeProgress")
110 public SafeProgressVO analysisTotalBySafeProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) { 110 public SafeProgressVO analysisTotalBySafeProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
111 String departIds = null;//DAY(LAST_DAY('"+startTime+"')) 111 String departIds = null;//DAY(LAST_DAY('"+startTime+"'))
...@@ -134,10 +134,13 @@ public class WorkAnalysisController { ...@@ -134,10 +134,13 @@ public class WorkAnalysisController {
134 userIds = "''"; 134 userIds = "''";
135 } 135 }
136 String sql = ""; 136 String sql = "";
137 //会议任务
137 sql += " left join( select depart_id , count(1) 'count' from ajh_meeting_send where meet_status =2 and meet_end_time >='"+startTime+"' and meet_end_time <= '"+endTime+"' group by depart_id )aaa on aaa.depart_id = d.id "; 138 sql += " left join( select depart_id , count(1) 'count' from ajh_meeting_send where meet_status =2 and meet_end_time >='"+startTime+"' and meet_end_time <= '"+endTime+"' group by depart_id )aaa on aaa.depart_id = d.id ";
138 sql += " left join (select depart_id , count(1) 'count' from ajh_meeting_send where meet_id in (select id from ajh_meeting where end_time >='"+startTime+"' and end_time <= '"+endTime+"') group by depart_id ) bbb on bbb.depart_id = d.id "; 139 sql += " left join (select depart_id , count(1) 'count' from ajh_meeting_send where meet_id in (select id from ajh_meeting where end_time >='"+startTime+"' and end_time <= '"+endTime+"') group by depart_id ) bbb on bbb.depart_id = d.id ";
140 // 考试任务
139 sql += " left join (select depart_id,count(user_id) 'count' from edu_user_paper where DATE_FORMAT(end_time,'%Y-%m-%d') >='"+startTime+"' and end_time <= '"+endTime+"' and user_id in("+userIds+") group by depart_id )ccc on ccc.depart_id = d.id"; 141 sql += " left join (select depart_id,count(user_id) 'count' from edu_user_paper where DATE_FORMAT(end_time,'%Y-%m-%d') >='"+startTime+"' and end_time <= '"+endTime+"' and user_id in("+userIds+") group by depart_id )ccc on ccc.depart_id = d.id";
140 sql += " left join ( select dep_id,count(user_id) 'count' from sys_user_depart where user_id in("+userIds+") group by dep_id )ddd on ddd.dep_id = d.id"; 142 sql += " left join ( select dep_id,count(user_id) 'count' from sys_user_depart where user_id in("+userIds+") group by dep_id )ddd on ddd.dep_id = d.id";
143 //风险排查任务
141 sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where status = '2' and end_date >= '"+startTime+" 00:00:00' and end_date <='"+endTime+" 23:59:59' group by depart_id ) eee on eee.depart_id = d.id "; 144 sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where status = '2' and end_date >= '"+startTime+" 00:00:00' and end_date <='"+endTime+" 23:59:59' group by depart_id ) eee on eee.depart_id = d.id ";
142 sql += " left join( select sum( (DATEDIFF('"+endTime+"', '"+startTime+"') +1)*24/ dlm.frequency ) 'count' , dlm.depart_id from danger_level_manage dlm where dlm.frequency IS NOT NULL and frequency <> '' ) fff on fff.depart_id = d.id "; 145 sql += " left join( select sum( (DATEDIFF('"+endTime+"', '"+startTime+"') +1)*24/ dlm.frequency ) 'count' , dlm.depart_id from danger_level_manage dlm where dlm.frequency IS NOT NULL and frequency <> '' ) fff on fff.depart_id = d.id ";
143 146
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!