Skip to content

张雷 / skboot-zhongye

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

运营问题修改

1 个父辈 143c3fa0
内嵌 并排
正在显示 2 个修改的文件 包含 14 行增加 和 5 行删除
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
...@@ -261,15 +261,20 @@ ...@@ -261,15 +261,20 @@
261 SELECT 261 SELECT
262 d.id AS depart_id, 262 d.id AS depart_id,
263 d.depart_name AS depart_name, 263 d.depart_name AS depart_name,
264 v3.ysl AS xssyl,
264 ROUND(f.pro_scale * v2.day_num,2) AS wsclgm, 265 ROUND(f.pro_scale * v2.day_num,2) AS wsclgm,
266 v3.gffdl,
265 v2.clsl AS wssjcll, 267 v2.clsl AS wssjcll,
266 round( 100 * ( v2.clsl / ( f.pro_scale * v2.day_num ) ), 2 ) AS wsfhl, 268 round( 100 * ( v2.clsl / ( f.pro_scale * v2.day_num ) ), 2 ) AS wsfhl,
267 v3.dh, 269 v3.dh,
268 v3.qy, 270 v3.qy,
269 v3.ysl AS xssyl,
270 ROUND(0.123*v3.dh+1.4286*v3.qy,4) AS zhnyxhl, 271 ROUND(0.123*v3.dh+1.4286*v3.qy,4) AS zhnyxhl,
271 ROUND(3*v3.qy+0.703*10*v3.dh,4) AS eyhtpfl, 272 ROUND(3*v3.qy+0.703*10*v3.dh,4) AS eyhtpfl,
272 ROUND( v3.dh / v2.clsl, 2 ) AS dsdh, 273 ROUND( v3.dh / v2.clsl, 2 ) AS dsdh,
274 v2.codxjl AS codxjl,
275 v2.adxjl AS adxjl,
276 v2.zlxjl AS tpxjl,
277 v2.zdxjl AS tnxjl,
273 v3.wnl AS ybgfcsl, 278 v3.wnl AS ybgfcsl,
274 v3.ybgfczl AS ybgfczl, 279 v3.ybgfczl AS ybgfczl,
275 ROUND(v3.wnl*(1-v3.wnhsl/100),2) AS jgwnl, 280 ROUND(v3.wnl*(1-v3.wnhsl/100),2) AS jgwnl,
...@@ -282,6 +287,10 @@ ...@@ -282,6 +287,10 @@
282 SELECT 287 SELECT
283 v.depart_id, 288 v.depart_id,
284 ROUND( SUM( v.CSL ) / 10000, 2 ) AS clsl, 289 ROUND( SUM( v.CSL ) / 10000, 2 ) AS clsl,
290 ROUND(SUM(IFNULL(JSZL,0) - IFNULL(CSZL,0)),2) AS zlxjl,
291 ROUND(SUM(IFNULL(JSCOD,0) - IFNULL(CSCOD,0)),2) AS codxjl,
292 ROUND(SUM(IFNULL(JSAD,0) - IFNULL(CSAD,0)),2) AS adxjl,
293 ROUND(SUM(IFNULL(JSZD,0) - IFNULL(CSTN,0)),2) AS zdxjl,
285 #{dayCount} AS day_num 294 #{dayCount} AS day_num
286 FROM 295 FROM
287 ${dataViewName2} v 296 ${dataViewName2} v
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
...@@ -222,7 +222,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa ...@@ -222,7 +222,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
222 String end = month + "-31"; 222 String end = month + "-31";
223 int dayCount = (int)DateUtils.differenceDay(start,end); 223 int dayCount = (int)DateUtils.differenceDay(start,end);
224 String departIds = mapper.getChildDepartId(departId); 224 String departIds = mapper.getChildDepartId(departId);
225 String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, start, end); 225 String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL,JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN", departIds, start, end);
226 String dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, start, end); 226 String dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, start, end);
227 List<JnhbReportData> list = mapper.getJnhbReport(dataViewName2, dataViewName3, start, end, departIds, dayCount); 227 List<JnhbReportData> list = mapper.getJnhbReport(dataViewName2, dataViewName3, start, end, departIds, dayCount);
228 return list; 228 return list;
...@@ -235,7 +235,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa ...@@ -235,7 +235,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
235 List<JnhbReportDetailsJs> jsList = new ArrayList<>(); 235 List<JnhbReportDetailsJs> jsList = new ArrayList<>();
236 List<JnhbReportDetailsHj> hjList = new ArrayList<>(); 236 List<JnhbReportDetailsHj> hjList = new ArrayList<>();
237 String year = month.substring(0,4); 237 String year = month.substring(0,4);
238 String dataViewName2 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, year); 238 String dataViewName2 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL,JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN", departId, year);
239 String dataViewName3 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"", departId, year); 239 String dataViewName3 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"", departId, year);
240 dyList = mapper.getDyList(dataViewName2, dataViewName3, departId, year); 240 dyList = mapper.getDyList(dataViewName2, dataViewName3, departId, year);
241 jsList = mapper.getJsList(dataViewName2, dataViewName3, departId, year); 241 jsList = mapper.getJsList(dataViewName2, dataViewName3, departId, year);
...@@ -249,7 +249,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa ...@@ -249,7 +249,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
249 //节能环保报表数据-部门+月数据 249 //节能环保报表数据-部门+月数据
250 private List<JnhbReportData> jnhbReportShowDepaetMonthDate(String departIds, String startTime, String endTime){ 250 private List<JnhbReportData> jnhbReportShowDepaetMonthDate(String departIds, String startTime, String endTime){
251 int dayCount = (int)DateUtils.differenceDay(startTime,endTime); 251 int dayCount = (int)DateUtils.differenceDay(startTime,endTime);
252 String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, startTime, endTime); 252 String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL,JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN", departIds, startTime, endTime);
253 String dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, startTime, endTime); 253 String dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, startTime, endTime);
254 List<JnhbReportData> list = mapper.getJnhbReport(dataViewName2, dataViewName3, startTime, endTime, departIds, dayCount); 254 List<JnhbReportData> list = mapper.getJnhbReport(dataViewName2, dataViewName3, startTime, endTime, departIds, dayCount);
255 return list; 255 return list;
...@@ -373,7 +373,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa ...@@ -373,7 +373,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
373 373
374 private JnhbReportData getJnhbReportSumData(String departIds, String startTime ,String endTime){ 374 private JnhbReportData getJnhbReportSumData(String departIds, String startTime ,String endTime){
375 //头部统计数据 375 //头部统计数据
376 String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, startTime, endTime); 376 String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL,JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN", departIds, startTime, endTime);
377 String dataViewName3 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, startTime, endTime); 377 String dataViewName3 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, startTime, endTime);
378 System.out.println("dataViewName3 = "+dataViewName3); 378 System.out.println("dataViewName3 = "+dataViewName3);
379 if(StringUtils.isNotEmpty(departIds)){ 379 if(StringUtils.isNotEmpty(departIds)){
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!