Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
72643557 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 524108c0 ed637cd3
内嵌 并排
正在显示 5 个修改的文件 包含 155 行增加 和 47 行删除
sk-base-common/src/main/java/com/skua/tool/util/DateUtils.java
...@@ -28,7 +28,7 @@ public class DateUtils { ...@@ -28,7 +28,7 @@ public class DateUtils {
28 } 28 }
29 29
30 public static void main(String[] args) { 30 public static void main(String[] args) {
31 System.out.println( formatDate("2024-01-01","yyyy-MM")); 31 System.out.println( formatDate("2024-01","yyyy-MM"));
32 } 32 }
33 /*** 33 /***
34 * 字符串日期格式化 34 * 字符串日期格式化
...@@ -627,5 +627,37 @@ public class DateUtils { ...@@ -627,5 +627,37 @@ public class DateUtils {
627 } 627 }
628 return monthList; 628 return monthList;
629 } 629 }
630 /***
631 * 获取当前年
632 * @return
633 */
634 public static int getCurrentYear(){
635 Date currentDate = new Date();
636 Calendar calendar = Calendar.getInstance();
637 calendar.setTime(currentDate);
638 return calendar.get(Calendar.YEAR);
639 }
630 640
641 /***
642 * 获取当前时间
643 * @return
644 */
645 public static String getCurrentDate(){
646 LocalDateTime now = LocalDateTime.now();
647 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
648 String formattedDate = now.format(formatter);
649 return formattedDate;
650 }
651 public static int getDateYear(String date){
652 Date currentDate = str2Date(date,"yyyy-MM-dd");
653 Calendar calendar = Calendar.getInstance();
654 calendar.setTime(currentDate);
655 return calendar.get(Calendar.YEAR);
656 }
657 public static int getDateMonth(String date){
658 Date currentDate = str2Date(date,"yyyy-MM-dd");
659 Calendar calendar = Calendar.getInstance();
660 calendar.setTime(currentDate);
661 return calendar.get(Calendar.MONTH)+1;
662 }
631 } 663 }
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhRectificationInfoController.java
...@@ -323,6 +323,7 @@ public class AjhRectificationInfoController { ...@@ -323,6 +323,7 @@ public class AjhRectificationInfoController {
323 * @param paramType 查询类型 323 * @param paramType 查询类型
324 * @return 324 * @return
325 */ 325 */
326 @ApiOperation(value="安全态势总览数据统计", notes="安全态势总览数据统计")
326 @RequestMapping(value = "/searchCenus", method = RequestMethod.GET) 327 @RequestMapping(value = "/searchCenus", method = RequestMethod.GET)
327 public Map<String,Object> searchSafeCensus(@RequestParam(name="now",required=true) String now,@RequestParam(name="paramType") String paramType) { 328 public Map<String,Object> searchSafeCensus(@RequestParam(name="now",required=true) String now,@RequestParam(name="paramType") String paramType) {
328 Map<String, Object> result = ajhRectificationInfoService.searchSafeCensus(now, paramType); 329 Map<String, Object> result = ajhRectificationInfoService.searchSafeCensus(now, paramType);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/AjhRectificationInfoMapper.java
...@@ -16,32 +16,36 @@ import java.util.Map; ...@@ -16,32 +16,36 @@ import java.util.Map;
16 * 隐患检查 16 * 隐患检查
17 */ 17 */
18 public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationInfo> { 18 public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationInfo> {
19 // top 头部统计
20 List<Map<String, Object>> topCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
19 21
22 // 文件统计
23 List<Map<String, Object>> docCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
20 // 隐患统计 24 // 隐患统计
21 List<Map<String, Object>> yhCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year); 25 List<Map<String, Object>> yhCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
22 26
23 27
24 //教育培训 28 //教育培训
25 List<Map<String, Object>> jyCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year); 29 List<Map<String, Object>> jyCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
26 30
27 31
28 //应急演练 32 //应急演练
29 List<Map<String, Object>> yjCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year); 33 List<Map<String, Object>> yjCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
30 34
31 35
32 //危化资料 36 //危化资料
33 List<Map<String, Object>> whCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year); 37 List<Map<String, Object>> whCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
34 38
35 39
36 //危险废物 40 //危险废物
37 List<Map<String, Object>> wxCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year); 41 List<Map<String, Object>> wxCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
38 42
39 43
40 //集团安全文件 44 //集团安全文件
41 List<Map<String, Object>> jtaqCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year); 45 List<Map<String, Object>> jtaqCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
42 46
43 //安全管理文件 47 //安全管理文件
44 List<Map<String, Object>> safeCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year); 48 List<Map<String, Object>> safeCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
45 49
46 50
47 /** 51 /**
...@@ -105,7 +109,7 @@ public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationI ...@@ -105,7 +109,7 @@ public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationI
105 * 安全隐患地图点位统计 109 * 安全隐患地图点位统计
106 * </pre> 110 * </pre>
107 * 111 *
108 * @param null 112 * @param
109 * @author Li Yuanyuan，2023/6/14 15:07 113 * @author Li Yuanyuan，2023/6/14 15:07
110 * @Description: TODO(这里描述这个方法的需求变更情况) 114 * @Description: TODO(这里描述这个方法的需求变更情况)
111 */ 115 */
...@@ -167,4 +171,6 @@ public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationI ...@@ -167,4 +171,6 @@ public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationI
167 "GROUP BY\n" + 171 "GROUP BY\n" +
168 "\trec_ord_body") 172 "\trec_ord_body")
169 List<Map<String, Object>> getStructNoHandleDetail(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); 173 List<Map<String, Object>> getStructNoHandleDetail(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
174
175
170 } 176 }
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhRectificationInfoMapper.xml
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.ajh.mapper.AjhRectificationInfoMapper"> 3 <mapper namespace="com.skua.modules.ajh.mapper.AjhRectificationInfoMapper">
4
5 <!-- topCensus-->
6 <select id="topCensus" resultType="java.util.Map">
7 select
8 '年度安全隐患统计' as 'name','yh' as 'code',
9 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
10 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear,
11 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year
12 from ajh_rectification_info sr
13 UNION
14 select
15 '年度教育培训统计' as 'name','jy' as 'code',
16 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
17 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear,
18 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year
19 from ajh_edu_training sr
20 UNION
21 select
22 '年度应急演练统计' as 'name','yj' as 'code',
23 SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
24 SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear,
25 SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year
26 from ajh_exercise_situation sr
27 UNION
28 select
29 '年度危险作业时间(起)' as 'name','wx' as 'code',
30 SUM( CASE WHEN LEFT ( sr.operation_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
31 SUM( CASE WHEN LEFT ( sr.operation_date, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear,
32 SUM( CASE WHEN LEFT ( sr.operation_date, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year
33 from dangerous_operation_manage sr
34 UNION
35 select
36 '特种设备数量(起)' as 'name','tzsb' as 'code',
37 count(1) as 'nowYear' , '0' as 'now' ,'0' as 'last_year'
38 from equipment_info where is_special =1
39 </select>
40
41 <!-- docCensus 文档统计-->
42 <select id="docCensus" resultType="java.util.Map">
43 select
44 '安全管理文件(本)' as 'name','doc' as 'code',
45 count(id) as 'total_num',
46 SUM( CASE WHEN fac_informationtype ='flfg' THEN 1 ELSE 0 END ) as flfg_num,
47 SUM( CASE WHEN fac_informationtype ='bzgf' THEN 1 ELSE 0 END ) as bzgf_num,
48 SUM( CASE WHEN fac_informationtype ='gzzd' THEN 1 ELSE 0 END ) as gzzd_num
49 from material_info
50 </select>
51
4 <!--隐患统计--> 52 <!--隐患统计-->
5 <select id="yhCensus" resultType="java.util.Map"> 53 <select id="yhCensus" resultType="java.util.Map">
6 SELECT 54 SELECT
7 sd.depart_name, 55 sd.depart_name,
8 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{now} THEN 1 ELSE 0 END ) as now, 56 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
9 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month, 57 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
10 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) =#{last_year} THEN 1 ELSE 0 END ) as last_year 58 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
11 FROM 59 FROM
12 sys_factory_info sf 60 sys_factory_info sf
13 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 61 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -18,9 +66,9 @@ ...@@ -18,9 +66,9 @@
18 <select id="jyCensus" resultType="java.util.Map"> 66 <select id="jyCensus" resultType="java.util.Map">
19 SELECT 67 SELECT
20 sd.depart_name, 68 sd.depart_name,
21 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{now} THEN 1 ELSE 0 END ) as now, 69 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
22 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month, 70 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
23 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{last_year} THEN 1 ELSE 0 END ) as last_year 71 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
24 FROM 72 FROM
25 sys_factory_info sf 73 sys_factory_info sf
26 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 74 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -32,9 +80,9 @@ ...@@ -32,9 +80,9 @@
32 <select id="yjCensus" resultType="java.util.Map"> 80 <select id="yjCensus" resultType="java.util.Map">
33 SELECT 81 SELECT
34 sd.depart_name, 82 sd.depart_name,
35 SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{now} THEN 1 ELSE 0 END ) as now, 83 SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
36 SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month, 84 SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
37 SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year 85 SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
38 FROM 86 FROM
39 sys_factory_info sf 87 sys_factory_info sf
40 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 88 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -46,9 +94,9 @@ ...@@ -46,9 +94,9 @@
46 <select id="whCensus" resultType="java.util.Map"> 94 <select id="whCensus" resultType="java.util.Map">
47 SELECT 95 SELECT
48 sd.depart_name, 96 sd.depart_name,
49 SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{now} THEN 1 ELSE 0 END ) as now, 97 SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
50 SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month, 98 SUM( CASE WHEN LEFT ( sr.create_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
51 SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year 99 SUM( CASE WHEN LEFT ( sr.create_time, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
52 FROM 100 FROM
53 sys_factory_info sf 101 sys_factory_info sf
54 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 102 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -60,9 +108,9 @@ ...@@ -60,9 +108,9 @@
60 <select id="wxCensus" resultType="java.util.Map"> 108 <select id="wxCensus" resultType="java.util.Map">
61 SELECT 109 SELECT
62 sd.depart_name, 110 sd.depart_name,
63 SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{now} THEN 1 ELSE 0 END ) as now, 111 SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
64 SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month, 112 SUM( CASE WHEN LEFT ( sr.pro_come_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
65 SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year 113 SUM( CASE WHEN LEFT ( sr.pro_come_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
66 FROM 114 FROM
67 sys_factory_info sf 115 sys_factory_info sf
68 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 116 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -75,9 +123,9 @@ ...@@ -75,9 +123,9 @@
75 <select id="jtaqCensus" resultType="java.util.Map"> 123 <select id="jtaqCensus" resultType="java.util.Map">
76 SELECT 124 SELECT
77 sd.depart_name, 125 sd.depart_name,
78 SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{now} THEN 1 ELSE 0 END ) as now, 126 SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
79 SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month, 127 SUM( CASE WHEN LEFT ( sr.acc_rep_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
80 SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year 128 SUM( CASE WHEN LEFT ( sr.acc_rep_time,4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
81 FROM 129 FROM
82 sys_factory_info sf 130 sys_factory_info sf
83 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 131 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -88,9 +136,9 @@ ...@@ -88,9 +136,9 @@
88 <select id="safeCensus" resultType="java.util.Map"> 136 <select id="safeCensus" resultType="java.util.Map">
89 SELECT 137 SELECT
90 sd.depart_name, 138 sd.depart_name,
91 SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{now} THEN 1 ELSE 0 END ) as now, 139 SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
92 SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month, 140 SUM( CASE WHEN LEFT ( sr.docu_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
93 SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year 141 SUM( CASE WHEN LEFT ( sr.docu_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
94 FROM 142 FROM
95 sys_factory_info sf 143 sys_factory_info sf
96 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 144 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhRectificationInfoServiceImpl.java
...@@ -38,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -38,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
38 import org.springframework.stereotype.Service; 38 import org.springframework.stereotype.Service;
39 import org.springframework.transaction.annotation.Transactional; 39 import org.springframework.transaction.annotation.Transactional;
40 40
41 import javax.annotation.Resource;
42 import java.text.ParseException; 41 import java.text.ParseException;
43 import java.time.LocalDateTime; 42 import java.time.LocalDateTime;
44 import java.time.format.DateTimeFormatter; 43 import java.time.format.DateTimeFormatter;
...@@ -68,46 +67,68 @@ public class AjhRectificationInfoServiceImpl extends ServiceImpl<AjhRectificatio ...@@ -68,46 +67,68 @@ public class AjhRectificationInfoServiceImpl extends ServiceImpl<AjhRectificatio
68 @Override 67 @Override
69 public Map<String, Object> searchSafeCensus(String now, String paramType) { 68 public Map<String, Object> searchSafeCensus(String now, String paramType) {
70 69
71 String lastYear = DateUtils.getLastYearMonthOfMonth(now); 70
72 String lastMonth = DateUtils.getLastMonthOfMonth(now); 71 String nowMonth = now;//本月
72 String[] dateList = now.split("-");
73 String lastYear = null;
74 String nowYear = null;
75 if(dateList.length > 1){
76 nowYear = dateList[0];
77 lastYear = Integer.parseInt(nowYear)-1+"";
78 }
79
80
73 Map<String, Object> result = new HashMap<>(); 81 Map<String, Object> result = new HashMap<>();
82
74 switch(paramType){ 83 switch(paramType){
84 case "top" :
85 List<Map<String, Object>> topResult = baseMapper.topCensus(nowMonth, nowYear, lastYear);
86 result.put("top",topResult);
87 return result;
88 case "doc" :
89 List<Map<String, Object>> docResult = baseMapper.docCensus(nowMonth, nowYear, lastYear);
90 result.put("doc",docResult);
91 return result;
75 case "yh" : 92 case "yh" :
76 List<Map<String, Object>> yhResult = baseMapper.yhCensus(now, lastMonth, lastYear); 93 List<Map<String, Object>> yhResult = baseMapper.yhCensus(nowMonth, nowYear, lastYear);
77 result.put("yh",yhResult); 94 result.put("yh",yhResult);
78 return result; 95 return result;
79 case "jy" : 96 case "jy" :
80 List<Map<String, Object>> jyResutl = baseMapper.jyCensus(now, lastMonth, lastYear); 97 List<Map<String, Object>> jyResutl = baseMapper.jyCensus(nowMonth, nowYear, lastYear);
81 result.put("jy",jyResutl); 98 result.put("jy",jyResutl);
82 return result; 99 return result;
83 case "yj" : 100 case "yj" :
84 List<Map<String, Object>> yjResult = baseMapper.yjCensus(now, lastMonth, lastYear); 101 List<Map<String, Object>> yjResult = baseMapper.yjCensus(nowMonth, nowYear, lastYear);
85 result.put("yj",yjResult); 102 result.put("yj",yjResult);
86 return result; 103 return result;
87 case "wh" : 104 case "wh" :
88 List<Map<String, Object>> whResult = baseMapper.whCensus(now, lastMonth, lastYear); 105 List<Map<String, Object>> whResult = baseMapper.whCensus(nowMonth, nowYear, lastYear);
89 result.put("wh",whResult); 106 result.put("wh",whResult);
90 return result; 107 return result;
91 case "wx" : 108 case "wx" :
92 List<Map<String, Object>> wxResult = baseMapper.wxCensus(now, lastMonth, lastYear); 109 List<Map<String, Object>> wxResult = baseMapper.wxCensus(nowMonth, nowYear, lastYear);
93 result.put("wx",wxResult); 110 result.put("wx",wxResult);
94 return result; 111 return result;
95 case "jt": 112 case "jt":
96 List<Map<String, Object>> jtReuslt = baseMapper.jtaqCensus(now, lastMonth, lastYear); 113 List<Map<String, Object>> jtReuslt = baseMapper.jtaqCensus(nowMonth, nowYear, lastYear);
97 result.put("jt",jtReuslt); 114 result.put("jt",jtReuslt);
98 return result; 115 return result;
99 case "sa" : 116 case "sa" :
100 List<Map<String, Object>> saResult = baseMapper.safeCensus(now, lastMonth, lastYear); 117 List<Map<String, Object>> saResult = baseMapper.safeCensus(nowMonth, nowYear, lastYear);
101 result.put("sa",saResult); 118 result.put("sa",saResult);
102 return result; 119 return result;
103 default : 120 default :
104 List<Map<String, Object>> yhResult1 = baseMapper.yhCensus(now, lastMonth, lastYear); 121 List<Map<String, Object>> topResult1 = baseMapper.topCensus(nowMonth, nowYear, lastYear);
105 List<Map<String, Object>> jyResutl1 = baseMapper.jyCensus(now, lastMonth, lastYear); 122 List<Map<String, Object>> docResult1 = baseMapper.docCensus(nowMonth, nowYear, lastYear);
106 List<Map<String, Object>> yjResult1 = baseMapper.yjCensus(now, lastMonth, lastYear); 123 List<Map<String, Object>> yhResult1 = baseMapper.yhCensus(nowMonth, nowYear, lastYear);
107 List<Map<String, Object>> whResult1 = baseMapper.whCensus(now, lastMonth, lastYear); 124 List<Map<String, Object>> jyResutl1 = baseMapper.jyCensus(nowMonth, nowYear, lastYear);
108 List<Map<String, Object>> wxResult1 = baseMapper.wxCensus(now, lastMonth, lastYear); 125 List<Map<String, Object>> yjResult1 = baseMapper.yjCensus(nowMonth, nowYear, lastYear);
109 List<Map<String, Object>> jtReuslt1 = baseMapper.jtaqCensus(now, lastMonth, lastYear); 126 List<Map<String, Object>> whResult1 = baseMapper.whCensus(nowMonth, nowYear, lastYear);
110 List<Map<String, Object>> saResult1 = baseMapper.safeCensus(now, lastMonth, lastYear); 127 List<Map<String, Object>> wxResult1 = baseMapper.wxCensus(nowMonth, nowYear, lastYear);
128 List<Map<String, Object>> jtReuslt1 = baseMapper.jtaqCensus(nowMonth, nowYear, lastYear);
129 List<Map<String, Object>> saResult1 = baseMapper.safeCensus(nowMonth, nowYear, lastYear);
130 result.put("top",topResult1);
131 result.put("doc",docResult1);
111 result.put("yh",yhResult1); 132 result.put("yh",yhResult1);
112 result.put("jy",jyResutl1); 133 result.put("jy",jyResutl1);
113 result.put("yj",yjResult1); 134 result.put("yj",yjResult1);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!