Skip to content

张雷 / skboot-zhongye

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

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

2 个父辈 43e5381e fb9a121b
内嵌 并排
正在显示 2 个修改的文件 包含 38 行增加 和 38 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhRectificationInfoMapper.xml
...@@ -6,30 +6,30 @@ ...@@ -6,30 +6,30 @@
6 <select id="topCensus" resultType="java.util.Map"> 6 <select id="topCensus" resultType="java.util.Map">
7 select 7 select
8 '年度安全隐患统计(起)' as 'name','yh' as 'code', 8 '年度安全隐患统计(起)' as 'name','yh' as 'code',
9 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now, 9 ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ),0) as now,
10 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear, 10 ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
11 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year 11 ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{lastYear} THEN 1 ELSE 0 END ),0) as last_year
12 from ajh_rectification_info sr 12 from ajh_rectification_info sr
13 UNION 13 UNION
14 select 14 select
15 '年度教育培训统计(起)' as 'name','jy' as 'code', 15 '年度教育培训统计(起)' as 'name','jy' as 'code',
16 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now, 16 ifnull( SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ),0) as now,
17 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear, 17 ifnull( SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) = #{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
18 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year 18 ifnull( SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) = #{lastYear} THEN 1 ELSE 0 END ),0) as last_year
19 from ajh_edu_training sr 19 from ajh_edu_training sr
20 UNION 20 UNION
21 select 21 select
22 '年度应急演练统计(起)' as 'name','yj' as 'code', 22 '年度应急演练统计(起)' as 'name','yj' as 'code',
23 SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now, 23 ifnull( SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ),0) as now,
24 SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear, 24 ifnull( SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) = #{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
25 SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year 25 ifnull( SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) = #{lastYear} THEN 1 ELSE 0 END ),0) as last_year
26 from ajh_exercise_situation sr 26 from ajh_exercise_situation sr
27 UNION 27 UNION
28 select 28 select
29 '年度危险作业事件(起)' as 'name','wx' as 'code', 29 '年度危险作业事件(起)' as 'name','wx' as 'code',
30 SUM( CASE WHEN LEFT ( sr.operation_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now, 30 ifnull( SUM( CASE WHEN LEFT ( sr.operation_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ),0) as now,
31 SUM( CASE WHEN LEFT ( sr.operation_date, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear, 31 ifnull( SUM( CASE WHEN LEFT ( sr.operation_date, 4 ) = #{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
32 SUM( CASE WHEN LEFT ( sr.operation_date, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year 32 ifnull( SUM( CASE WHEN LEFT ( sr.operation_date, 4 ) = #{lastYear} THEN 1 ELSE 0 END ),0) as last_year
33 from dangerous_operation_manage sr 33 from dangerous_operation_manage sr
34 UNION 34 UNION
35 select 35 select
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
43 select 43 select
44 '安全管理文件(本)' as 'name','doc' as 'code', 44 '安全管理文件(本)' as 'name','doc' as 'code',
45 count(id) as 'total_num', 45 count(id) as 'total_num',
46 SUM( CASE WHEN fac_informationtype ='flfg' THEN 1 ELSE 0 END ) as flfg_num, 46 ifnull( SUM( CASE WHEN fac_informationtype ='flfg' THEN 1 ELSE 0 END ),0) as flfg_num,
47 SUM( CASE WHEN fac_informationtype ='bzgf' THEN 1 ELSE 0 END ) as bzgf_num, 47 ifnull( SUM( CASE WHEN fac_informationtype ='bzgf' THEN 1 ELSE 0 END ),0) as bzgf_num,
48 SUM( CASE WHEN fac_informationtype ='gzzd' THEN 1 ELSE 0 END ) as gzzd_num 48 ifnull( SUM( CASE WHEN fac_informationtype ='gzzd' THEN 1 ELSE 0 END ),0) as gzzd_num
49 from material_info 49 from material_info
50 </select> 50 </select>
51 51
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
53 <select id="yhCensus" resultType="java.util.Map"> 53 <select id="yhCensus" resultType="java.util.Map">
54 SELECT 54 SELECT
55 sd.depart_name, 55 sd.depart_name,
56 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now, 56 ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ),0) as now,
57 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear, 57 ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
58 SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year 58 ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{lastYear} THEN 1 ELSE 0 END ),0) as last_year
59 FROM 59 FROM
60 sys_factory_info sf 60 sys_factory_info sf
61 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 61 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
66 <select id="jyCensus" resultType="java.util.Map"> 66 <select id="jyCensus" resultType="java.util.Map">
67 SELECT 67 SELECT
68 sd.depart_name, 68 sd.depart_name,
69 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now, 69 ifnull( SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ),0) as now,
70 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear, 70 ifnull( SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
71 SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year 71 ifnull( SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ),0) as last_year
72 FROM 72 FROM
73 sys_factory_info sf 73 sys_factory_info sf
74 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 74 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
80 <select id="yjCensus" resultType="java.util.Map"> 80 <select id="yjCensus" resultType="java.util.Map">
81 SELECT 81 SELECT
82 sd.depart_name, 82 sd.depart_name,
83 SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now, 83 ifnull( SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ),0) as now,
84 SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear, 84 ifnull( SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
85 SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year 85 ifnull( SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) =#{lastYear} THEN 1 ELSE 0 END ),0) as last_year
86 FROM 86 FROM
87 sys_factory_info sf 87 sys_factory_info sf
88 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 88 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -94,9 +94,9 @@ ...@@ -94,9 +94,9 @@
94 <select id="whCensus" resultType="java.util.Map"> 94 <select id="whCensus" resultType="java.util.Map">
95 SELECT 95 SELECT
96 sd.depart_name, 96 sd.depart_name,
97 SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now, 97 ifnull( SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ),0) as now,
98 SUM( CASE WHEN LEFT ( sr.create_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear, 98 ifnull( SUM( CASE WHEN LEFT ( sr.create_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
99 SUM( CASE WHEN LEFT ( sr.create_time, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year 99 ifnull( SUM( CASE WHEN LEFT ( sr.create_time, 4 ) =#{lastYear} THEN 1 ELSE 0 END ),0) as last_year
100 FROM 100 FROM
101 sys_factory_info sf 101 sys_factory_info sf
102 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 102 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -108,9 +108,9 @@ ...@@ -108,9 +108,9 @@
108 <select id="wxCensus" resultType="java.util.Map"> 108 <select id="wxCensus" resultType="java.util.Map">
109 SELECT 109 SELECT
110 sd.depart_name, 110 sd.depart_name,
111 SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now, 111 ifnull(SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ),0) as now,
112 SUM( CASE WHEN LEFT ( sr.pro_come_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear, 112 ifnull(SUM( CASE WHEN LEFT ( sr.pro_come_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
113 SUM( CASE WHEN LEFT ( sr.pro_come_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year 113 ifnull( SUM( CASE WHEN LEFT ( sr.pro_come_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ),0) as last_year
114 FROM 114 FROM
115 sys_factory_info sf 115 sys_factory_info sf
116 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 116 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -123,9 +123,9 @@ ...@@ -123,9 +123,9 @@
123 <select id="jtaqCensus" resultType="java.util.Map"> 123 <select id="jtaqCensus" resultType="java.util.Map">
124 SELECT 124 SELECT
125 sd.depart_name, 125 sd.depart_name,
126 SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now, 126 ifnull( SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ),0) as now,
127 SUM( CASE WHEN LEFT ( sr.acc_rep_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear, 127 ifnull( SUM( CASE WHEN LEFT ( sr.acc_rep_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
128 SUM( CASE WHEN LEFT ( sr.acc_rep_time,4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year 128 ifnull( SUM( CASE WHEN LEFT ( sr.acc_rep_time,4 ) =#{lastYear} THEN 1 ELSE 0 END ),0) as last_year
129 FROM 129 FROM
130 sys_factory_info sf 130 sys_factory_info sf
131 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id 131 LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
...@@ -136,9 +136,9 @@ ...@@ -136,9 +136,9 @@
136 <select id="safeCensus" resultType="java.util.Map"> 136 <select id="safeCensus" resultType="java.util.Map">
137 SELECT 137 SELECT
138 sd.depart_name, 138 sd.depart_name,
139 SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now, 139 ifnull( SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ),0) as now,
140 SUM( CASE WHEN LEFT ( sr.docu_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear, 140 ifnull( SUM( CASE WHEN LEFT ( sr.docu_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
141 SUM( CASE WHEN LEFT ( sr.docu_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year 141 ifnull( SUM( CASE WHEN LEFT ( sr.docu_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ),0) as last_year
142 FROM 142 FROM
143 sys_factory_info sf 143 sys_factory_info sf
144 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/mapper/xml/LeaderInspectionRecordMapper.xml
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
5 <!--统计数量 --> 5 <!--统计数量 -->
6 <select id="statisticsNum" resultType="com.skua.modules.ajh.vo.LeaderInspectionRecordVO"> 6 <select id="statisticsNum" resultType="com.skua.modules.ajh.vo.LeaderInspectionRecordVO">
7 SELECT 7 SELECT
8 SUM(IF(`inspection_type`='1',inspection_type,0)) as 'swgsjcNum', 8 ifnull(SUM(IF(`inspection_type`='1',inspection_type,0)) ,0) as 'swgsjcNum',
9 SUM(IF(`inspection_type`='2',inspection_type,0))/2 as 'xmbjcNum' 9 ifnull(SUM(IF(`inspection_type`='2',inspection_type,0))/2 ,0) as 'xmbjcNum'
10 FROM ajh_leader_inspection_record 10 FROM ajh_leader_inspection_record
11 <where> 11 <where>
12 <if test="departIds != null and departIds != ''"> 12 <if test="departIds != null and departIds != ''">
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!