Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
4ca8a4da 由 kangwei
选项

Merge remote-tracking branch 'origin/master'

2 个父辈 2db4e31d 1a4fc839
内嵌 并排
正在显示 11 个修改的文件 包含 59 行增加 和 35 行删除
sk-module-alarm/src/main/java/com/skua/modules/quartz/DeviceStatusJob.java
...@@ -285,6 +285,7 @@ public class DeviceStatusJob implements Job { ...@@ -285,6 +285,7 @@ public class DeviceStatusJob implements Job {
285 AlarmRecordHistory alarmRecordHistory = new AlarmRecordHistory(); 285 AlarmRecordHistory alarmRecordHistory = new AlarmRecordHistory();
286 alarmRecordHistory.setAlarmParamCode(plc); 286 alarmRecordHistory.setAlarmParamCode(plc);
287 alarmRecordHistory.setAlarmRuleType("B001B005"); 287 alarmRecordHistory.setAlarmRuleType("B001B005");
288 alarmRecordHistory.setAlarmRuleTypeTreepath("B001,B001B005");
288 alarmRecordHistory.setAlarmParamType(paramType); 289 alarmRecordHistory.setAlarmParamType(paramType);
289 alarmRecordHistory.setActualAvgValue("断线"); 290 alarmRecordHistory.setActualAvgValue("断线");
290 alarmRecordHistory.setDelFlag(1); 291 alarmRecordHistory.setDelFlag(1);
......
sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/controller/SysCommandCentreController.java
...@@ -5,6 +5,7 @@ import com.skua.core.api.vo.Result; ...@@ -5,6 +5,7 @@ import com.skua.core.api.vo.Result;
5 import com.skua.core.aspect.annotation.AutoLog; 5 import com.skua.core.aspect.annotation.AutoLog;
6 import com.skua.core.context.BaseContextHandler; 6 import com.skua.core.context.BaseContextHandler;
7 import com.skua.core.util.ConvertUtils; 7 import com.skua.core.util.ConvertUtils;
8 import com.skua.modules.common.service.ICommonSqlService;
8 import com.skua.modules.custom.service.IFCustomReportDatasetService; 9 import com.skua.modules.custom.service.IFCustomReportDatasetService;
9 import com.skua.modules.dataAnalysis.service.ICommandCentreService; 10 import com.skua.modules.dataAnalysis.service.ICommandCentreService;
10 import com.skua.modules.algorithm.service.impl.ReportItemvService; 11 import com.skua.modules.algorithm.service.impl.ReportItemvService;
...@@ -12,7 +13,6 @@ import com.skua.modules.algorithm.vo.DepartLoadRateResultVO; ...@@ -12,7 +13,6 @@ import com.skua.modules.algorithm.vo.DepartLoadRateResultVO;
12 import com.skua.modules.algorithm.vo.StackedAreaChartDataVO; 13 import com.skua.modules.algorithm.vo.StackedAreaChartDataVO;
13 import com.skua.modules.algorithm.vo.WaterTreatmentVO; 14 import com.skua.modules.algorithm.vo.WaterTreatmentVO;
14 import com.skua.modules.common.vo.DateVO; 15 import com.skua.modules.common.vo.DateVO;
15 import com.skua.modules.equipment.vo.EquipmentRepairAnalysisVO;
16 import com.skua.modules.guest.util.DateUtil; 16 import com.skua.modules.guest.util.DateUtil;
17 import com.skua.modules.report.vo.DepartDrugResult; 17 import com.skua.modules.report.vo.DepartDrugResult;
18 import com.skua.modules.report.vo.FRportlCommandCenterVO; 18 import com.skua.modules.report.vo.FRportlCommandCenterVO;
...@@ -56,7 +56,8 @@ public class SysCommandCentreController { ...@@ -56,7 +56,8 @@ public class SysCommandCentreController {
56 private ReportItemvService reportItemvService; 56 private ReportItemvService reportItemvService;
57 @Autowired 57 @Autowired
58 private IFCustomReportDatasetService reportDatasetService; 58 private IFCustomReportDatasetService reportDatasetService;
59 59 @Autowired
60 private ICommonSqlService commonSqlService;
60 61
61 /** 62 /**
62 * 分页列表查询 63 * 分页列表查询
...@@ -71,12 +72,12 @@ public class SysCommandCentreController { ...@@ -71,12 +72,12 @@ public class SysCommandCentreController {
71 DateVO dateVO = new DateVO(reportItemvParam.getStartDate()); 72 DateVO dateVO = new DateVO(reportItemvParam.getStartDate());
72 String departIds = BaseContextHandler.getDeparts(); 73 String departIds = BaseContextHandler.getDeparts();
73 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 74 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
74 departIds = reportItemvParam.getDepartIds(); 75 departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
75 } 76 }
76 //本月数据 77 //本月数据
77 String monthCSL = reportItemvService.getSumCSL(departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate()); 78 String monthCSL = reportItemvService.getSumCSL(departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
78 //环比 上月数据 79 //环比 上月数据
79 String lastMonthCSL = reportItemvService.getSumCSL(departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate()); 80 String lastMonthCSL = reportItemvService.getSumCSL(departIds, dateVO.getLastMonthStartTime(), dateVO.getLastMonthEndTime());
80 //同比 去年数据 81 //同比 去年数据
81 String lastYearCSL = reportItemvService.getSumCSL(departIds, dateVO.getLastYearMonthStartTime(), dateVO.getLastYearMonthEndTime()); 82 String lastYearCSL = reportItemvService.getSumCSL(departIds, dateVO.getLastYearMonthStartTime(), dateVO.getLastYearMonthEndTime());
82 83
...@@ -84,11 +85,11 @@ public class SysCommandCentreController { ...@@ -84,11 +85,11 @@ public class SysCommandCentreController {
84 long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime()); 85 long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
85 long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime()); 86 long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
86 //月对象数据 value, valueTb, valueHb 87 //月对象数据 value, valueTb, valueHb
87 FRportlCommandCenterVO monthDataVO = new FRportlCommandCenterVO("月汇总数据",JSUtils.divide(monthCSL,10000),JSUtils.divide(lastMonthCSL,10000),JSUtils.divide(lastYearCSL,10000)); 88 FRportlCommandCenterVO monthDataVO = new FRportlCommandCenterVO("月汇总数据",JSUtils.divide(monthCSL,10000),JSUtils.divide(lastYearCSL,10000),JSUtils.divide(lastMonthCSL,10000));
88 //日处理对象 89 //日处理对象
89 FRportlCommandCenterVO avgDayDataVO = new FRportlCommandCenterVO("日均处理水量",JSUtils.divide(monthCSL,nowDifferDay*10000),JSUtils.divide(lastMonthCSL,lastMonthDifferDay*10000),JSUtils.divide(lastYearCSL,lastYearDifferDay*10000)); 90 FRportlCommandCenterVO avgDayDataVO = new FRportlCommandCenterVO("日均处理水量",JSUtils.divide(monthCSL,nowDifferDay*10000),JSUtils.divide(lastYearCSL,lastYearDifferDay*10000),JSUtils.divide(lastMonthCSL,lastMonthDifferDay*10000));
90 fReportItemvList.add( monthDataVO); 91 fReportItemvList.add(monthDataVO);
91 fReportItemvList.add( avgDayDataVO ); 92 fReportItemvList.add(avgDayDataVO);
92 93
93 //年数据统计： 94 //年数据统计：
94 String total = factoryInfoService.querySumProScale( JSUtils.quoteEach(departIds,",") ); 95 String total = factoryInfoService.querySumProScale( JSUtils.quoteEach(departIds,",") );
...@@ -109,7 +110,7 @@ public class SysCommandCentreController { ...@@ -109,7 +110,7 @@ public class SysCommandCentreController {
109 Result<DepartLoadRateResultVO > result = new Result<>(); 110 Result<DepartLoadRateResultVO > result = new Result<>();
110 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 111 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
111 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 112 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
112 departIds = reportItemvParam.getDepartIds(); 113 departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
113 } 114 }
114 Integer loadRateType = reportItemvParam.getLoadRateType(); 115 Integer loadRateType = reportItemvParam.getLoadRateType();
115 if(loadRateType == null ) loadRateType = 1; 116 if(loadRateType == null ) loadRateType = 1;
...@@ -127,7 +128,7 @@ public class SysCommandCentreController { ...@@ -127,7 +128,7 @@ public class SysCommandCentreController {
127 Result<List<WaterTreatmentVO>> result = new Result<>(); 128 Result<List<WaterTreatmentVO>> result = new Result<>();
128 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 129 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
129 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 130 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
130 departIds = reportItemvParam.getDepartIds(); 131 departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
131 } 132 }
132 List<WaterTreatmentVO> waterTrendVOList = commandCentreService.statisticsCLSLXQ(reportItemvParam.getStartDate(),reportItemvParam.getEndDate(), departIds); 133 List<WaterTreatmentVO> waterTrendVOList = commandCentreService.statisticsCLSLXQ(reportItemvParam.getStartDate(),reportItemvParam.getEndDate(), departIds);
133 result.setResult(waterTrendVOList ); 134 result.setResult(waterTrendVOList );
...@@ -142,7 +143,7 @@ public class SysCommandCentreController { ...@@ -142,7 +143,7 @@ public class SysCommandCentreController {
142 Result<List<FRportlCommandCenterVO>> result = new Result(); 143 Result<List<FRportlCommandCenterVO>> result = new Result();
143 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 144 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
144 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 145 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
145 departIds = reportItemvParam.getDepartIds(); 146 departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
146 } 147 }
147 List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByCement(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate()); 148 List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByCement(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
148 result.setResult(dataList ); 149 result.setResult(dataList );
...@@ -156,7 +157,7 @@ public class SysCommandCentreController { ...@@ -156,7 +157,7 @@ public class SysCommandCentreController {
156 Result<List<ReportItemVO>> result = new Result(); 157 Result<List<ReportItemVO>> result = new Result();
157 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 158 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
158 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 159 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
159 departIds = reportItemvParam.getDepartIds(); 160 departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
160 } 161 }
161 List<ReportItemVO> dataList = reportItemvService.statisticsByCementList(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate()); 162 List<ReportItemVO> dataList = reportItemvService.statisticsByCementList(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
162 result.setResult(dataList ); 163 result.setResult(dataList );
...@@ -198,7 +199,7 @@ public class SysCommandCentreController { ...@@ -198,7 +199,7 @@ public class SysCommandCentreController {
198 Result<List<FRportlCommandCenterVO>> result = new Result(); 199 Result<List<FRportlCommandCenterVO>> result = new Result();
199 String departId = BaseContextHandler.getDeparts(); 200 String departId = BaseContextHandler.getDeparts();
200 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 201 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
201 departId = reportItemvParam.getDepartIds(); 202 departId = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
202 } 203 }
203 List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByElectricity(departId,reportItemvParam.getStartDate(),reportItemvParam.getEndDate()); 204 List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByElectricity(departId,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
204 result.setResult(dataList ); 205 result.setResult(dataList );
...@@ -226,7 +227,7 @@ public class SysCommandCentreController { ...@@ -226,7 +227,7 @@ public class SysCommandCentreController {
226 Result<List<ReportItemVO>> result = new Result(); 227 Result<List<ReportItemVO>> result = new Result();
227 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 228 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
228 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 229 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
229 departIds = reportItemvParam.getDepartIds(); 230 departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
230 } 231 }
231 List<ReportItemVO> dataList = reportItemvService.statisticsByElectricityList(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate()); 232 List<ReportItemVO> dataList = reportItemvService.statisticsByElectricityList(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
232 result.setResult(dataList ); 233 result.setResult(dataList );
...@@ -243,7 +244,7 @@ public class SysCommandCentreController { ...@@ -243,7 +244,7 @@ public class SysCommandCentreController {
243 List<String> consumeList = new ArrayList<>();//电耗集合 244 List<String> consumeList = new ArrayList<>();//电耗集合
244 String departIds = BaseContextHandler.getDeparts(); 245 String departIds = BaseContextHandler.getDeparts();
245 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 246 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
246 departIds = reportItemvParam.getDepartIds(); 247 departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
247 } 248 }
248 List<ReportDateTrendVO> dlhjDateList = reportItemvService.getDayDateFieldList(ReportConstant.view3a24, "DLHJ", departIds, reportItemvParam.getStartDate(), reportItemvParam.getEndDate()); 249 List<ReportDateTrendVO> dlhjDateList = reportItemvService.getDayDateFieldList(ReportConstant.view3a24, "DLHJ", departIds, reportItemvParam.getStartDate(), reportItemvParam.getEndDate());
249 List<ReportDateTrendVO> cslDateList = reportItemvService.getDayDateFieldList(ReportConstant.view2119, "CSL", departIds, reportItemvParam.getStartDate(), reportItemvParam.getEndDate()); 250 List<ReportDateTrendVO> cslDateList = reportItemvService.getDayDateFieldList(ReportConstant.view2119, "CSL", departIds, reportItemvParam.getStartDate(), reportItemvParam.getEndDate());
...@@ -312,7 +313,7 @@ public class SysCommandCentreController { ...@@ -312,7 +313,7 @@ public class SysCommandCentreController {
312 reportItemvParam.setEndDate( DateUtils.formatDate(endDate ,"YYYY-MM")); 313 reportItemvParam.setEndDate( DateUtils.formatDate(endDate ,"YYYY-MM"));
313 String departIds = BaseContextHandler.getDeparts(); 314 String departIds = BaseContextHandler.getDeparts();
314 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 315 if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
315 departIds = reportItemvParam.getDepartIds(); 316 departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
316 } 317 }
317 reportItemvParam.setDepartIds( JSUtils.quoteEach(departIds,",")); 318 reportItemvParam.setDepartIds( JSUtils.quoteEach(departIds,","));
318 List<ReportDateTrendVO> fyDataList = commandCentreService.getFyData(reportItemvParam); 319 List<ReportDateTrendVO> fyDataList = commandCentreService.getFyData(reportItemvParam);
...@@ -363,14 +364,11 @@ public class SysCommandCentreController { ...@@ -363,14 +364,11 @@ public class SysCommandCentreController {
363 @AutoLog(value = "指挥中心-药剂趋势") 364 @AutoLog(value = "指挥中心-药剂趋势")
364 @ApiOperation(value="指挥中心-药剂趋势", notes="指挥中心-药剂趋势") 365 @ApiOperation(value="指挥中心-药剂趋势", notes="指挥中心-药剂趋势")
365 @GetMapping(value = "/statisticsByYjqs") 366 @GetMapping(value = "/statisticsByYjqs")
366 public Result<DepartDrugResult> statisticsByYjqs(@RequestParam(name = "month", required = true)String month) { 367 public Result<DepartDrugResult> statisticsByYjqs(@RequestParam(name = "month", required = true) String month,
367 // DateVO dateVO = new DateVO(month); 368 @RequestParam(name = "departIds", required = true) String departIds) {
368 369 // String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
369 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 370 String departId = commonSqlService.getChildFactorys(departIds);
370 /* if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){ 371 DepartDrugResult departDrugResult = commandCentreService.getYhTotal(departId,month);
371 departIds = reportItemvParam.getDepartIds();
372 }*/
373 DepartDrugResult departDrugResult = commandCentreService.getYhTotal(departIds,month);
374 Result<DepartDrugResult> result = new Result<>(); 372 Result<DepartDrugResult> result = new Result<>();
375 result.setSuccess(true); 373 result.setSuccess(true);
376 result.setResult(departDrugResult); 374 result.setResult(departDrugResult);
......
sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/service/impl/CommandCentreServiceImpl.java
...@@ -60,7 +60,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService { ...@@ -60,7 +60,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
60 List<DepartDrugDataVO> drugList = null; 60 List<DepartDrugDataVO> drugList = null;
61 drugList = fReportItemvMapper.getYhList(month,monthTb,monthHb, 61 drugList = fReportItemvMapper.getYhList(month,monthTb,monthHb,
62 dataViewName2119,dataViewName2119tb,dataViewName2119hb, 62 dataViewName2119,dataViewName2119tb,dataViewName2119hb,
63 dataViewName3a24,dataViewName3a24tb,dataViewName3a24hb); 63 dataViewName3a24,dataViewName3a24tb,dataViewName3a24hb,departIds);
64 departDrugResult.setDrugList(drugList); 64 departDrugResult.setDrugList(drugList);
65 return departDrugResult; 65 return departDrugResult;
66 } 66 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINVO.java
...@@ -23,6 +23,10 @@ public class MaterialINVO extends MaterialIN { ...@@ -23,6 +23,10 @@ public class MaterialINVO extends MaterialIN {
23 @ApiModelProperty(value = "税额") 23 @ApiModelProperty(value = "税额")
24 private String taxAmount; 24 private String taxAmount;
25 25
26
27 @ApiModelProperty(value = "药剂入口编号")
28 private String materialInId;
29
26 @ApiModelProperty(value = "权限厂站编号集合") 30 @ApiModelProperty(value = "权限厂站编号集合")
27 private String departIds; 31 private String departIds;
28 32
......
sk-module-biz/src/main/java/com/skua/modules/statistics/service/impl/ReportTargetStatisticsServiceImpl.java
...@@ -60,7 +60,7 @@ public class ReportTargetStatisticsServiceImpl implements IReportTargetStatisti ...@@ -60,7 +60,7 @@ public class ReportTargetStatisticsServiceImpl implements IReportTargetStatisti
60 sql += " left join( select aaa.depart_id, round(ifnull(sum(aaa.CSL)/10000,0),2) 'CSL' from " + dataViewName2119_month+"aaa group by aaa.depart_id ) ddd on ddd.depart_id = d.id "; 60 sql += " left join( select aaa.depart_id, round(ifnull(sum(aaa.CSL)/10000,0),2) 'CSL' from " + dataViewName2119_month+"aaa group by aaa.depart_id ) ddd on ddd.depart_id = d.id ";
61 sql += " where d.depart_type = 1 "; 61 sql += " where d.depart_type = 1 ";
62 if(StringUtils.isNotEmpty(departIds)){ 62 if(StringUtils.isNotEmpty(departIds)){
63 sql += " and d.id in ("+departIds+") "; 63 sql += " and d.id in ("+JSUtils.quoteEach(departIds,",")+") ";
64 } 64 }
65 sql += "order by ccc.CSL desc "; 65 sql += "order by ccc.CSL desc ";
66 List<ReportTargetStatisticsVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetStatisticsVO.class)); 66 List<ReportTargetStatisticsVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetStatisticsVO.class));
...@@ -94,7 +94,7 @@ public class ReportTargetStatisticsServiceImpl implements IReportTargetStatisti ...@@ -94,7 +94,7 @@ public class ReportTargetStatisticsServiceImpl implements IReportTargetStatisti
94 sql += " left join ( select aaa.depart_id , round(ifnull(avg(aaa.yyh),0),2) yyh ,round(ifnull(avg(aaa.ydh),0),2) ydh from "+dataViewName4411_month+" aaa group by aaa.depart_id )bbb on bbb.depart_id = d.id"; 94 sql += " left join ( select aaa.depart_id , round(ifnull(avg(aaa.yyh),0),2) yyh ,round(ifnull(avg(aaa.ydh),0),2) ydh from "+dataViewName4411_month+" aaa group by aaa.depart_id )bbb on bbb.depart_id = d.id";
95 sql += " where d.depart_type = 1 "; 95 sql += " where d.depart_type = 1 ";
96 if(StringUtils.isNotEmpty(departIds)){ 96 if(StringUtils.isNotEmpty(departIds)){
97 sql += " and d.id in ("+departIds+") "; 97 sql += " and d.id in ("+JSUtils.quoteEach(departIds,",")+") ";
98 } 98 }
99 List<ReportTargetEnergyVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetEnergyVO.class)); 99 List<ReportTargetEnergyVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetEnergyVO.class));
100 return dataList; 100 return dataList;
...@@ -140,7 +140,7 @@ public class ReportTargetStatisticsServiceImpl implements IReportTargetStatisti ...@@ -140,7 +140,7 @@ public class ReportTargetStatisticsServiceImpl implements IReportTargetStatisti
140 sql += " left join( select aaa.depart_id, round(ifnull(sum(aaa.ysjsf)/10000,0),2) 'ysjsf' from " + dataViewName4411_month+"aaa group by aaa.depart_id ) ddd on ddd.depart_id = d.id "; 140 sql += " left join( select aaa.depart_id, round(ifnull(sum(aaa.ysjsf)/10000,0),2) 'ysjsf' from " + dataViewName4411_month+"aaa group by aaa.depart_id ) ddd on ddd.depart_id = d.id ";
141 sql += " where d.depart_type = 1 "; 141 sql += " where d.depart_type = 1 ";
142 if(StringUtils.isNotEmpty(departIds)){ 142 if(StringUtils.isNotEmpty(departIds)){
143 sql += " and d.id in ("+departIds+") "; 143 sql += " and d.id in ("+JSUtils.quoteEach(departIds,",")+") ";
144 } 144 }
145 List<ReportTargetStatisticsVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetStatisticsVO.class)); 145 List<ReportTargetStatisticsVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetStatisticsVO.class));
146 return dataList; 146 return dataList;
......
sk-module-biz/src/main/java/com/skua/modules/statistics/vo/ReportTargetStatisticsVO.java
1 package com.skua.modules.statistics.vo; 1 package com.skua.modules.statistics.vo;
2 2
3 import cn.jiguang.common.utils.StringUtils;
3 import com.skua.core.aspect.annotation.Dict; 4 import com.skua.core.aspect.annotation.Dict;
4 import com.skua.tool.util.JSUtils; 5 import com.skua.tool.util.JSUtils;
5 import io.swagger.annotations.ApiModel; 6 import io.swagger.annotations.ApiModel;
......
sk-module-datafill/src/main/java/com/skua/modules/report/mapper/FReportItemvMapper.java
...@@ -52,7 +52,8 @@ public interface FReportItemvMapper extends BaseMapper<FReportItemv> { ...@@ -52,7 +52,8 @@ public interface FReportItemvMapper extends BaseMapper<FReportItemv> {
52 List<DepartDrugDataVO> getYhList(@Param("month") String month, @Param("monthTb") String monthTb, @Param("monthHb") String monthHb, 52 List<DepartDrugDataVO> getYhList(@Param("month") String month, @Param("monthTb") String monthTb, @Param("monthHb") String monthHb,
53 @Param("dataViewName2119") String dataViewName2119, @Param("dataViewName2119tb") String dataViewName2119tb, 53 @Param("dataViewName2119") String dataViewName2119, @Param("dataViewName2119tb") String dataViewName2119tb,
54 @Param("dataViewName2119hb") String dataViewName2119hb, @Param("dataViewName3a24") String dataViewName3a24, 54 @Param("dataViewName2119hb") String dataViewName2119hb, @Param("dataViewName3a24") String dataViewName3a24,
55 @Param("dataViewName3a24tb") String dataViewName3a24tb, @Param("dataViewName3a24hb") String dataViewName3a24hb); 55 @Param("dataViewName3a24tb") String dataViewName3a24tb, @Param("dataViewName3a24hb") String dataViewName3a24hb,
56 @Param("departIds") String departIds);
56 57
57 DepartDrugResult getYhData(@Param("month") String month, @Param("monthTb") String monthTb, @Param("monthHb") String monthHb, 58 DepartDrugResult getYhData(@Param("month") String month, @Param("monthTb") String monthTb, @Param("monthHb") String monthHb,
58 @Param("dataViewName3a24") String dataViewName3a24,@Param("dataViewName3a24tb") String dataViewName3a24tb, 59 @Param("dataViewName3a24") String dataViewName3a24,@Param("dataViewName3a24tb") String dataViewName3a24tb,
......
sk-module-datafill/src/main/java/com/skua/modules/report/mapper/xml/FReportItemvMapper.xml
...@@ -162,6 +162,10 @@ ...@@ -162,6 +162,10 @@
162 ) dhhb ON dhhb.depart_id = d.id 162 ) dhhb ON dhhb.depart_id = d.id
163 WHERE 163 WHERE
164 d.depart_type = '1' 164 d.depart_type = '1'
165 and d.id in
166 <foreach item="item" index="index" collection="departIds.split(',')" open="(" separator="," close=")">
167 '${item}'
168 </foreach>
165 ORDER BY dh.yjdh desc,d.depart_order 169 ORDER BY dh.yjdh desc,d.depart_order
166 </select> 170 </select>
167 <select id="getYhData" resultType="com.skua.modules.report.vo.DepartDrugResult"> 171 <select id="getYhData" resultType="com.skua.modules.report.vo.DepartDrugResult">
......
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/ReportElectricCostServiceImpl.java
...@@ -3,6 +3,7 @@ package com.skua.modules.report.service.impl; ...@@ -3,6 +3,7 @@ package com.skua.modules.report.service.impl;
3 import com.baomidou.mybatisplus.core.metadata.IPage; 3 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.skua.core.context.BaseContextHandler; 5 import com.skua.core.context.BaseContextHandler;
6 import com.skua.modules.common.service.ICommonSqlService;
6 import com.skua.modules.report.entity.ReportElectricCost; 7 import com.skua.modules.report.entity.ReportElectricCost;
7 import com.skua.modules.report.mapper.ReportElectricCostMapper; 8 import com.skua.modules.report.mapper.ReportElectricCostMapper;
8 import com.skua.modules.report.service.IReportElectricCostService; 9 import com.skua.modules.report.service.IReportElectricCostService;
...@@ -24,15 +25,17 @@ public class ReportElectricCostServiceImpl extends ServiceImpl<ReportElectricCos ...@@ -24,15 +25,17 @@ public class ReportElectricCostServiceImpl extends ServiceImpl<ReportElectricCos
24 25
25 @Resource 26 @Resource
26 private ReportElectricCostMapper reportElectricCostMapper; 27 private ReportElectricCostMapper reportElectricCostMapper;
28 @Autowired
29 private ICommonSqlService commonSqlService;
27 //月度电费报表-分页列表查询 30 //月度电费报表-分页列表查询
28 @Override 31 @Override
29 public IPage<ReportElectricCost> getPage(Page<ReportElectricCost> page, ReportElectricCost reportElectricCost) { 32 public IPage<ReportElectricCost> getPage(Page<ReportElectricCost> page, ReportElectricCost reportElectricCost) {
30 if(StringUtils.isEmpty(reportElectricCost.getDepartId())){ 33 if(StringUtils.isEmpty(reportElectricCost.getDepartId())){
31 reportElectricCost.setDepartId(BaseContextHandler.getDeparts()); 34 reportElectricCost.setDepartId(BaseContextHandler.getDeparts());
35 }else{
36 String departIds = commonSqlService.getChildFactorys(reportElectricCost.getDepartId());
37 reportElectricCost.setDepartId(departIds);
32 } 38 }
33 // if(reportElectricCost.getMonth()!=null){
34 // queryWrapper.like("month",reportElectricCost.getMonth());
35 // }
36 List<ReportElectricCost> list = new ArrayList<>(); 39 List<ReportElectricCost> list = new ArrayList<>();
37 list = reportElectricCostMapper.getPage(reportElectricCost); 40 list = reportElectricCostMapper.getPage(reportElectricCost);
38 page.setRecords(list); 41 page.setRecords(list);
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionAbnormalItemsTrendVO.java
...@@ -34,4 +34,16 @@ public class InspectionAbnormalItemsTrendVO { ...@@ -34,4 +34,16 @@ public class InspectionAbnormalItemsTrendVO {
34 private Integer notCheckedItemsCount; 34 private Integer notCheckedItemsCount;
35 @ApiModelProperty(value = "异常项数量") 35 @ApiModelProperty(value = "异常项数量")
36 private Integer abnormalItemsCount; 36 private Integer abnormalItemsCount;
37
38 public Integer getNotCheckedItemsCount() {
39 if (totalCount != null && checkedItemsCount != null) {
40 if (totalCount - checkedItemsCount < 0) {
41 return checkedItemsCount - totalCount;
42 } else {
43 return totalCount - checkedItemsCount;
44 }
45 } else {
46 return 0;
47 }
48 }
37 } 49 }
......
sk-module-system/src/main/java/com/skua/modules/system/service/impl/SysDepartServiceImpl.java
...@@ -100,9 +100,9 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart ...@@ -100,9 +100,9 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
100 listResult.addAll(jtList); 100 listResult.addAll(jtList);
101 } 101 }
102 } 102 }
103 if (!StringUtils.isBlank(departType)) { 103 // if (!StringUtils.isBlank(departType)) {
104 listResult = filterDepartList(listResult); 104 // listResult = filterDepartList(listResult);
105 } 105 // }
106 return listResult; 106 return listResult;
107 } 107 }
108 108
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!