Skip to content

张雷 / skboot-zhongye

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

厂区驾驶舱接口开发

1 个父辈 041dcd38
内嵌 并排
正在显示 7 个修改的文件 包含 329 行增加 和 73 行删除
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EmergencyRiskEventController.java
...@@ -33,7 +33,7 @@ import java.util.stream.Collectors; ...@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
33 */ 33 */
34 @Slf4j 34 @Slf4j
35 @Api(tags="应急风险事件") 35 @Api(tags="应急风险事件")
36 @RestController("webEmergencyRiskEventController") 36 @RestController
37 @RequestMapping("/web/emergency/emergencyRiskEvent") 37 @RequestMapping("/web/emergency/emergencyRiskEvent")
38 public class EmergencyRiskEventController { 38 public class EmergencyRiskEventController {
39 @Autowired 39 @Autowired
......
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EventMapController.java 0 → 100644
1 package com.skua.modules.emergency.controller;
2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.skua.core.api.vo.Result;
5 import com.skua.core.aspect.annotation.AutoLog;
6 import com.skua.modules.emergency.entity.EmergencyRiskEvent;
7 import com.skua.modules.emergency.service.IEmergencyRiskEventService;
8 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation;
10 import lombok.extern.slf4j.Slf4j;
11 import org.springframework.beans.factory.annotation.Autowired;
12 import org.springframework.web.bind.annotation.*;
13 import java.util.*;
14
15 /**
16 * 安全环保地图接口
17 */
18 @Slf4j
19 @Api(tags="安全环保地图")
20 @RestController
21 @RequestMapping("/safetyEnviron/map")
22 public class EventMapController {
23 @Autowired
24 private IEmergencyRiskEventService emergencyRiskEventService;
25
26 /**
27 * 安全隐患事件数量
28 */
29 @AutoLog(value = "安全隐患事件数量")
30 @ApiOperation(value="安全隐患事件数量", notes="安全隐患事件数量")
31 @GetMapping(value = "/getCount")
32 public Result<Map<String,Object>> getHandleCount(EmergencyRiskEvent emergencyRiskEvent){
33 Result<Map<String,Object>> result = new Result<>();
34 Map<String,Object> map = emergencyRiskEventService.getCount(emergencyRiskEvent);
35 result.setSuccess(true);
36 result.setResult(map);
37 return result;
38 }
39
40
41
42 }
sk-module-biz/src/main/java/com/skua/modules/emergency/service/IEmergencyRiskEventService.java
...@@ -25,14 +25,9 @@ public interface IEmergencyRiskEventService extends IService<EmergencyRiskEvent> ...@@ -25,14 +25,9 @@ public interface IEmergencyRiskEventService extends IService<EmergencyRiskEvent>
25 void handle(EmergencyRiskEventHandleDto dto); 25 void handle(EmergencyRiskEventHandleDto dto);
26 26
27 /** 27 /**
28 * <pre> 28 * 安全隐患事件数量统计
29 * 运营总览，应急事件已/未处理数量 29 * @param emergencyRiskEvent
30 * </pre> 30 * @return
31 * @param startTime
32 * @param endTime
33 * @param handleType【1未处理/3已处理】
34 * @author Li Yuanyuan，2023/7/3 14:09
35 * @Description: TODO(这里描述这个方法的需求变更情况)
36 */ 31 */
37 Map<String,Object> getNoHandleWorkOrderInfo(String startTime, String endTime, String handleType); 32 Map<String, Object> getCount(EmergencyRiskEvent emergencyRiskEvent);
38 } 33 }
......
sk-module-biz/src/main/java/com/skua/modules/emergency/service/impl/EmergencyRiskEventServiceImpl.java
...@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service; ...@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
29 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 29 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
30 import org.springframework.transaction.annotation.Transactional; 30 import org.springframework.transaction.annotation.Transactional;
31 31
32 import java.util.HashMap;
32 import java.util.List; 33 import java.util.List;
33 import java.util.Map; 34 import java.util.Map;
34 35
...@@ -92,19 +93,12 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven ...@@ -92,19 +93,12 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven
92 } 93 }
93 94
94 @Override 95 @Override
95 public Map<String, Object> getNoHandleWorkOrderInfo(String startTime, String endTime, String handleType) { 96 public Map<String, Object> getCount(EmergencyRiskEvent emergencyRiskEvent) {
96 QueryWrapper queryWrapper = new QueryWrapper(); 97 Map<String, Object> map = new HashMap<>();
97 if(StringUtils.isEmpty(startTime)){ 98 map.put("total","9");
98 //默认开始时间当年第一天 99 map.put("yes","5");
99 //结束时间未今天 100 map.put("no","4");
100 endTime = DateUtils.getTodayOrMonthDate("day")+" 23:59:59"; 101 return map;
101 startTime = endTime.substring(0,4)+"-01-01 00:00:00";
102 }
103 queryWrapper.select("count(*) AS num ");
104 queryWrapper.eq("handle_result",handleType);
105 queryWrapper.ge("report_date",startTime);
106 queryWrapper.le("report_date",endTime);
107 return getMap(queryWrapper);
108 } 102 }
109 103
110 @Override 104 @Override
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/FactoryCenterMapper.java
1 package com.skua.modules.dataAnalysis.mapper; 1 package com.skua.modules.dataAnalysis.mapper;
2 2
3 import org.apache.ibatis.annotations.Param;
4
5 import java.util.List;
6 import java.util.Map;
7
3 public interface FactoryCenterMapper { 8 public interface FactoryCenterMapper {
4 9
10 List<Map<String, Object>> getWssltj(@Param("startDate") String startDate, @Param("endDate") String endDate,
11 @Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
12 @Param("departId") String departId);
13
14 List<Map<String, Object>> getHdltj(@Param("startDate") String startDate, @Param("endDate") String endDate,
15 @Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
16 @Param("departId") String departId);
17
18 List<Map<String, Object>> getCnltj(@Param("startDate") String startDate, @Param("endDate") String endDate,
19 @Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
20 @Param("departId") String departId);
21
22 Map<String, Object> getData(@Param("month") String month, @Param("departId") String departId);
5 } 23 }
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/FactoryCenterMapper.xml
...@@ -2,4 +2,160 @@ ...@@ -2,4 +2,160 @@
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.dataAnalysis.mapper.FactoryCenterMapper"> 3 <mapper namespace="com.skua.modules.dataAnalysis.mapper.FactoryCenterMapper">
4 4
5 <select id="getWssltj" resultType="java.util.HashMap">
6 SELECT
7 LEFT ( v.time, 7 ) AS time,
8 round( sum( v.CSL ) / 10000, 2 ) AS clsl,
9 ifnull(v2.clsl,0) as clsl_tb
10 FROM
11 view_2119 v
12 left join (
13 SELECT
14 RIGHT( LEFT ( time, 7 ), 2 ) AS time,
15 round( sum( CSL ) / 10000, 2 ) AS clsl
16 FROM
17 view_2119
18 WHERE
19 depart_id = #{departId}
20 AND time &gt;= #{startDateTb}
21 AND time &lt;= #{endDateTb}
22 GROUP BY
23 LEFT ( time, 7 )
24 ) v2 on RIGHT( LEFT ( v.time, 7 ), 2 ) = v2.time
25 WHERE v.depart_id = #{departId}
26 AND v.time &gt;= #{startDate}
27 AND v.time &lt;= #{endDate}
28 GROUP BY
29 LEFT ( v.time, 7 )
30 </select>
31
32 <select id="getHdltj" resultType="java.util.HashMap">
33 SELECT
34 ROUND(SUM(v3.DLHJ)/10000,2) as hdl,
35 ROUND(ifnull(v2.clsl,0),2) as clsl,
36 ROUND(SUM(v3.DLHJ)/ifnull(v2.clsl,0),2) as dsdh,
37 ROUND(pre.hdl/10000,2) as hdl_tb,
38 ROUND(pre.clsl,2) as clsl_tb,
39 ROUND(pre.dsdh,2) as dsdh_tb,
40 LEFT(v3.time,7) as time
41 FROM
42 view_3a24 v3
43 left join (
44 SELECT
45 SUM(CSL) as clsl,
46 LEFT(time,7) as time
47 FROM
48 view_2119
49 WHERE
50 depart_id = #{departId}
51 AND time &gt;= #{startDate}
52 AND time &lt;= #{endDate}
53 GROUP BY LEFT ( time, 7 )
54 ) v2 on LEFT(v3.time,7) = v2.time
55 left join (
56 SELECT
57 SUM(v3.DLHJ) as hdl,
58 ifnull(v2.clsl,0) as clsl,
59 round(SUM(v3.DLHJ)/ifnull(v2.clsl,0),2) as dsdh,
60 LEFT(v3.time,7) as time
61 FROM
62 view_3a24 v3
63 left join (
64 SELECT
65 SUM(CSL) as clsl,
66 LEFT(time,7) as time
67 FROM
68 view_2119
69 WHERE
70 depart_id = #{departId}
71 AND time &gt;= #{startDateTb}
72 AND time &lt;= #{endDateTb}
73 GROUP BY LEFT ( time, 7 )
74 ) v2 on LEFT(v3.time,7) = v2.time
75 WHERE
76 v3.depart_id = #{departId}
77 AND v3.time &gt;= #{startDateTb}
78 AND v3.time &lt;= #{endDateTb}
79 GROUP BY LEFT ( v3.time, 7 )
80 ) pre on right(pre.time,2) = right(LEFT(v3.time,7),2)
81 WHERE
82 v3.depart_id = #{departId}
83 AND v3.time &gt;= #{startDate}
84 AND v3.time &lt;= #{endDate}
85 GROUP BY LEFT ( v3.time, 7 )
86 </select>
87
88 <select id="getCnltj" resultType="java.util.HashMap">
89 SELECT
90 SUM(v3.WNL) as cnl,
91 ifnull(v2.clsl,0) as clsl,
92 round(SUM(v3.WNL)/(ifnull(v2.clsl,0)/10000),2) as wdscnl,
93 pre.cnl as cnl_tb,
94 pre.clsl as clsl_tb,
95 pre.wdscnl as wdscnl_tb,
96 LEFT(v3.time,7) as time
97 FROM
98 view_3a24 v3
99 left join (
100 SELECT
101 SUM(CSL) as clsl,
102 LEFT(time,7) as time
103 FROM
104 view_2119
105 WHERE
106 depart_id = #{departId}
107 AND time &gt;= #{startDate}
108 AND time &lt;= #{endDate}
109 GROUP BY LEFT ( time, 7 )
110 ) v2 on LEFT(v3.time,7) = v2.time
111 left join (
112 SELECT
113 SUM(v3.WNL) as cnl,
114 ifnull(v2.clsl,0) as clsl,
115 round(SUM(v3.WNL)/(ifnull(v2.clsl,0)/10000),2) as wdscnl,
116 LEFT(v3.time,7) as time
117 FROM
118 view_3a24 v3
119 left join (
120 SELECT
121 SUM(CSL) as clsl,
122 LEFT(time,7) as time
123 FROM
124 view_2119
125 WHERE
126 depart_id = #{departId}
127 AND time &gt;= #{startDateTb}
128 AND time &lt;= #{endDateTb}
129 GROUP BY LEFT ( time, 7 )
130 ) v2 on LEFT(v3.time,7) = v2.time
131 WHERE
132 v3.depart_id = #{departId}
133 AND v3.time &gt;= #{startDateTb}
134 AND v3.time &lt;= #{endDateTb}
135 GROUP BY LEFT ( v3.time, 7 )
136 ) pre on right(pre.time,2) = right(LEFT(v3.time,7),2)
137 WHERE
138 v3.depart_id = #{departId}
139 AND v3.time &gt;= #{startDate}
140 AND v3.time &lt;= #{endDate}
141 GROUP BY LEFT ( v3.time, 7 )
142 </select>
143
144 <select id="getData" resultType="java.util.HashMap">
145 SELECT
146 ROUND(SUM( v3.DLHJ )/10000,2) AS yzdl,
147 ROUND(AVG( v3.DLHJ )/10000,2) AS rjdl,
148 ROUND(SUM( v3.WNL ),2) AS yzcnl,
149 ROUND(SUM( v2.CSL )/10000,2) AS yclsl,
150 ROUND(SUM( v3.DLHJ )/SUM( v2.CSL ),2) as dsdh,
151 ROUND(AVG( v2.CSL )/10000,2) AS rjclsl,
152 ROUND(SUM( v3.WNL )/(SUM( v2.CSL )/10000),2) as wdscnl,
153 LEFT ( v3.time, 7 ) AS time
154 FROM
155 view_3a24 v3
156 LEFT JOIN (select CSL,time from view_2119 where LEFT ( time, 7 ) = #{month} and depart_id = #{departId}) v2 ON v2.time = v3.time
157 where LEFT ( v3.time, 7 ) = #{month}
158 and v3.depart_id = #{departId}
159 </select>
160
5 </mapper> 161 </mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
...@@ -188,48 +188,84 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -188,48 +188,84 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
188 @Override 188 @Override
189 public Map<String, Object> getData(String departId,String month) { 189 public Map<String, Object> getData(String departId,String month) {
190 Map<String, Object> map = new HashMap<>(); 190 Map<String, Object> map = new HashMap<>();
191 String monthTb = "2023-06";
192 String monthHb = "2024-05";
193 Map<String, Object> valueMap = factoryCenterMapper.getData(month, departId);
194 Map<String, Object> hbValueMap = factoryCenterMapper.getData(monthHb, departId);
195 Map<String, Object> tbValueMap = factoryCenterMapper.getData(monthTb, departId);
191 map.put("yclsl",new HashMap<>()); 196 map.put("yclsl",new HashMap<>());
192 Map<String, Object> yclslMap = new HashMap<>(); 197 Map<String, Object> yclslMap = new HashMap<>();
193 yclslMap.put("value","0"); 198 yclslMap.put("unit","万吨");
194 yclslMap.put("valueTb","0");
195 yclslMap.put("unit","吨");
196 yclslMap.put("valueHb","0");
197 map.put("rjclsl",new HashMap<>()); 199 map.put("rjclsl",new HashMap<>());
198 Map<String, Object> rjclslMap = new HashMap<>(); 200 Map<String, Object> rjclslMap = new HashMap<>();
199 rjclslMap.put("value","0"); 201 rjclslMap.put("unit","万吨");
200 rjclslMap.put("unit","吨");
201 rjclslMap.put("valueTb","0");
202 rjclslMap.put("valueHb","0");
203 map.put("yzdl",new HashMap<>()); 202 map.put("yzdl",new HashMap<>());
204 Map<String, Object> yzdlMap = new HashMap<>(); 203 Map<String, Object> yzdlMap = new HashMap<>();
205 yzdlMap.put("value","0"); 204 yzdlMap.put("unit","万Kw.h");
206 yzdlMap.put("unit","Kw.h");
207 yzdlMap.put("valueTb","0");
208 yzdlMap.put("valueHb","0");
209 map.put("dsdh",new HashMap<>()); 205 map.put("dsdh",new HashMap<>());
210 Map<String, Object> dsdhMap = new HashMap<>(); 206 Map<String, Object> dsdhMap = new HashMap<>();
211 dsdhMap.put("value","0");
212 dsdhMap.put("unit","Kw.h/吨水"); 207 dsdhMap.put("unit","Kw.h/吨水");
213 dsdhMap.put("valueTb","-");
214 dsdhMap.put("valueHb","0");
215 map.put("yzcnl",new HashMap<>()); 208 map.put("yzcnl",new HashMap<>());
216 Map<String, Object> yzcnlMap = new HashMap<>(); 209 Map<String, Object> yzcnlMap = new HashMap<>();
217 yzcnlMap.put("value","0");
218 yzcnlMap.put("unit","吨"); 210 yzcnlMap.put("unit","吨");
219 yzcnlMap.put("valueTb","-");
220 yzcnlMap.put("valueHb","0");
221 map.put("wdscnl",new HashMap<>()); 211 map.put("wdscnl",new HashMap<>());
222 Map<String, Object> wdscnlMap = new HashMap<>(); 212 Map<String, Object> wdscnlMap = new HashMap<>();
223 wdscnlMap.put("value","0");
224 wdscnlMap.put("unit","吨/万吨"); 213 wdscnlMap.put("unit","吨/万吨");
225 wdscnlMap.put("valueTb","-");
226 wdscnlMap.put("valueHb","0");
227 map.put("rjdl",new HashMap<>()); 214 map.put("rjdl",new HashMap<>());
228 Map<String, Object> rjdlMap = new HashMap<>(); 215 Map<String, Object> rjdlMap = new HashMap<>();
229 rjdlMap.put("value","0"); 216 rjdlMap.put("unit","万Kw.h");
230 rjdlMap.put("unit","Kw.h"); 217 if(valueMap != null){
231 rjdlMap.put("valueTb","-"); 218 yclslMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("yclsl")) ? valueMap.get("yclsl").toString() : "-");//月总处理水量
232 rjdlMap.put("valueHb","0"); 219 rjclslMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("rjclsl")) ? valueMap.get("rjclsl").toString() : "-");//日均处理水量
220 yzdlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("yzdl")) ? valueMap.get("yzdl").toString() : "-");//月总电量
221 dsdhMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("dsdh")) ? valueMap.get("dsdh").toString() : "-");//吨水电耗
222 yzcnlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("yzcnl")) ? valueMap.get("yzcnl").toString() : "-");//月总产泥量
223 wdscnlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("wdscnl")) ? valueMap.get("wdscnl").toString() : "-");//万吨水产泥量
224 rjdlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("rjdl")) ? valueMap.get("rjdl").toString() : "-");//日均电量
225 }else{
226 yclslMap.put("value","-");//月总处理水量
227 rjclslMap.put("value","-");//日均处理水量
228 yzdlMap.put("value","-");//月总电量
229 dsdhMap.put("value","-");//吨水电耗
230 yzcnlMap.put("value","-");//月总产泥量
231 wdscnlMap.put("value","-");//万吨水产泥量
232 rjdlMap.put("value","-");//日均电量
233 }
234 if(hbValueMap != null){
235 yclslMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("yclsl")) ? hbValueMap.get("yclsl").toString() : "-");//月总处理水量
236 rjclslMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("rjclsl")) ? hbValueMap.get("rjclsl").toString() : "-");//日均处理水量
237 yzdlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("yzdl")) ? hbValueMap.get("yzdl").toString() : "-");//月总电量
238 dsdhMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("dsdh")) ? hbValueMap.get("dsdh").toString() : "-");//吨水电耗
239 yzcnlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("yzcnl")) ? hbValueMap.get("yzcnl").toString() : "-");//月总产泥量
240 wdscnlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("wdscnl")) ? hbValueMap.get("wdscnl").toString() : "-");//万吨水产泥量
241 rjdlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("rjdl")) ? hbValueMap.get("rjdl").toString() : "-");//日均电量
242 }else{
243 yclslMap.put("valueHb","-");//月总处理水量
244 rjclslMap.put("valueHb","-");//日均处理水量
245 yzdlMap.put("valueHb","-");//月总电量
246 dsdhMap.put("valueHb","-");//吨水电耗
247 yzcnlMap.put("valueHb","-");//月总产泥量
248 wdscnlMap.put("valueHb","-");//万吨水产泥量
249 rjdlMap.put("valueHb","-");//日均电量
250 }
251 if(tbValueMap != null){
252 yclslMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("yclsl")) ? tbValueMap.get("yclsl").toString() : "-");//月总处理水量
253 rjclslMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("rjclsl")) ? tbValueMap.get("rjclsl").toString() : "-");//日均处理水量
254 yzdlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("yzdl")) ? tbValueMap.get("yzdl").toString() : "-");//月总电量
255 dsdhMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("dsdh")) ? tbValueMap.get("dsdh").toString() : "-");//吨水电耗
256 yzcnlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("yzcnl")) ? tbValueMap.get("yzcnl").toString() : "-");//月总产泥量
257 wdscnlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("wdscnl")) ? tbValueMap.get("wdscnl").toString() : "-");//万吨水产泥量
258 rjdlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("rjdl")) ? tbValueMap.get("rjdl").toString() : "-");//日均电量
259 }else{
260 yclslMap.put("valueTb","-");//月总处理水量
261 rjclslMap.put("valueTb","-");//日均处理水量
262 yzdlMap.put("valueTb","-");//月总电量
263 dsdhMap.put("valueTb","-");//吨水电耗
264 yzcnlMap.put("valueTb","-");//月总产泥量
265 wdscnlMap.put("valueTb","-");//万吨水产泥量
266 rjdlMap.put("valueTb","-");//日均电量
267 }
268 //汇总
233 map.put("yclsl", yclslMap); 269 map.put("yclsl", yclslMap);
234 map.put("rjclsl", rjclslMap); 270 map.put("rjclsl", rjclslMap);
235 map.put("yzdl", yzdlMap); 271 map.put("yzdl", yzdlMap);
...@@ -245,15 +281,20 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -245,15 +281,20 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
245 List<Map<String, Object>> list = new ArrayList<>(); 281 List<Map<String, Object>> list = new ArrayList<>();
246 String startDate = statisticsParam.getStartDate(); 282 String startDate = statisticsParam.getStartDate();
247 String endDate = statisticsParam.getEndDate(); 283 String endDate = statisticsParam.getEndDate();
248 List<String> monthList = getMonthsBetween(startDate,endDate); 284 String startDateTb = "2023-01-01";
249 for ( String month : monthList ) { 285 String endDateTb = "2023-09-31";
250 Map<String, Object> map = new HashMap<>(); 286 list = factoryCenterMapper.getCnltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
251 map.put("time",month); 287 if(list.size() == 0){
252 map.put("cnl","0"); 288 List<String> monthList = getMonthsBetween(startDate,endDate);
253 map.put("wdscnl","0"); 289 for ( String month : monthList ) {
254 map.put("cnl_tb","0"); 290 Map<String, Object> map = new HashMap<>();
255 map.put("wdscnl_tb","0"); 291 map.put("time",month);
256 list.add(map); 292 map.put("cnl","0");
293 map.put("wdscnl","0");
294 map.put("cnl_tb","0");
295 map.put("wdscnl_tb","0");
296 list.add(map);
297 }
257 } 298 }
258 return list; 299 return list;
259 } 300 }
...@@ -263,15 +304,20 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -263,15 +304,20 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
263 List<Map<String, Object>> list = new ArrayList<>(); 304 List<Map<String, Object>> list = new ArrayList<>();
264 String startDate = statisticsParam.getStartDate(); 305 String startDate = statisticsParam.getStartDate();
265 String endDate = statisticsParam.getEndDate(); 306 String endDate = statisticsParam.getEndDate();
266 List<String> monthList = getMonthsBetween(startDate,endDate); 307 String startDateTb = "2023-01-01";
267 for ( String month : monthList ) { 308 String endDateTb = "2023-09-31";
268 Map<String, Object> map = new HashMap<>(); 309 list = factoryCenterMapper.getHdltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
269 map.put("time",month); 310 if(list.size() == 0){
270 map.put("hdl","0"); 311 List<String> monthList = getMonthsBetween(startDate,endDate);
271 map.put("dsdh","0"); 312 for ( String month : monthList ) {
272 map.put("hdl_tb","0"); 313 Map<String, Object> map = new HashMap<>();
273 map.put("dsdh_tb","0"); 314 map.put("time",month);
274 list.add(map); 315 map.put("hdl","0");
316 map.put("dsdh","0");
317 map.put("hdl_tb","0");
318 map.put("dsdh_tb","0");
319 list.add(map);
320 }
275 } 321 }
276 return list; 322 return list;
277 } 323 }
...@@ -281,13 +327,18 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -281,13 +327,18 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
281 List<Map<String, Object>> list = new ArrayList<>(); 327 List<Map<String, Object>> list = new ArrayList<>();
282 String startDate = statisticsParam.getStartDate(); 328 String startDate = statisticsParam.getStartDate();
283 String endDate = statisticsParam.getEndDate(); 329 String endDate = statisticsParam.getEndDate();
284 List<String> monthList = getMonthsBetween(startDate,endDate); 330 String startDateTb = "2023-01-01";
285 for ( String month : monthList ) { 331 String endDateTb = "2023-09-31";
286 Map<String, Object> map = new HashMap<>(); 332 list = factoryCenterMapper.getWssltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
287 map.put("time",month); 333 if(list.size() == 0){
288 map.put("clsl","0"); 334 List<String> monthList = getMonthsBetween(startDate,endDate);
289 map.put("clsl_tb","0"); 335 for ( String month : monthList ) {
290 list.add(map); 336 Map<String, Object> map = new HashMap<>();
337 map.put("time",month);
338 map.put("clsl","0");
339 map.put("clsl_tb","0");
340 list.add(map);
341 }
291 } 342 }
292 return list; 343 return list;
293 } 344 }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!