Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
a76768e6 由 sonin
选项

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

2 个父辈 a5d16b6c 594fa130
内嵌 并排
正在显示 3 个修改的文件 包含 25 行增加 和 15 行删除
sk-module-biz/src/main/java/com/skua/modules/report/controller/OperationDailyController.java
...@@ -42,11 +42,12 @@ public class OperationDailyController { ...@@ -42,11 +42,12 @@ public class OperationDailyController {
42 public Result<Map<String, OperationDailyVO>> operationDaily(String dateTIme) { 42 public Result<Map<String, OperationDailyVO>> operationDaily(String dateTIme) {
43 Result<Map<String,OperationDailyVO>> result = new Result<>(); 43 Result<Map<String,OperationDailyVO>> result = new Result<>();
44 Map<String,OperationDailyVO> dataMap = new HashMap<>(); 44 Map<String,OperationDailyVO> dataMap = new HashMap<>();
45 45 //南京
46 // System.out.println("sql = "+sql); 46 OperationDailyVO njOperationDaily = getOperationDailyVOB( "1892199062790823936", dateTIme);
47 OperationDailyVO njOperationDaily = getOperationDailyVOB( "1892199062790823936", dateTIme);//南京 47 //武汉
48 OperationDailyVO whOperationDaily = getOperationDailyVOB( "1892199890272477184", dateTIme);//武汉 48 OperationDailyVO whOperationDaily = getOperationDailyVOB( "1892199890272477184", dateTIme);
49 OperationDailyVO efhbOperationDaily = getOperationDailyVOB( "1818215543140909056", dateTIme);//恩菲环保 49 //恩菲环保
50 OperationDailyVO efhbOperationDaily = getOperationDailyVOB( "1818215543140909056", dateTIme);
50 51
51 dataMap.put("njData",njOperationDaily); 52 dataMap.put("njData",njOperationDaily);
52 dataMap.put("whData",whOperationDaily); 53 dataMap.put("whData",whOperationDaily);
...@@ -96,17 +97,18 @@ public class OperationDailyController { ...@@ -96,17 +97,18 @@ public class OperationDailyController {
96 operationDailyVO.setWnDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") ); 97 operationDailyVO.setWnDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
97 98
98 // 6 污泥浓度公司 99 // 6 污泥浓度公司
100 String mlssUpper = "7000";
101 String mlssLower = "3000";
99 String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff,"AYHGMLSS,BYHGMLSS,CYHGMLSS,DYHGMLSS,EYHGMLSS,FYHGMLSS", departIds, dateTIme,dateTIme); 102 String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff,"AYHGMLSS,BYHGMLSS,CYHGMLSS,DYHGMLSS,EYHGMLSS,FYHGMLSS", departIds, dateTIme,dateTIme);
100 sql = "select ifnull(GROUP_CONCAT(d.depart_name),'无') depart_name from ("; 103 sql = "select ifnull(GROUP_CONCAT(d.depart_name),'无') depart_name from (";
101 sql += "select aaa.depart_id ,"; 104 sql += "select aaa.depart_id ,";
102 sql +=" CASE WHEN (ifnull(aaa.AYHGMLSS,0) - ifnull(bbb.mlss,99999999.99)) > 0 THEN 1 "; 105 sql += " CASE WHEN ( ifnull( aaa.AYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.AYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
103 sql += " WHEN (ifnull(aaa.BYHGMLSS,0) - ifnull(bbb.mlss,99999999.99) ) >0 THEN 1 "; 106 sql += " WHEN ( ifnull( aaa.BYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.BYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
104 sql += " WHEN (ifnull(aaa.CYHGMLSS,0) - ifnull(bbb.mlss,99999999.99) ) >0 THEN 1 "; 107 sql += " WHEN ( ifnull( aaa.CYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.CYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
105 sql +=" WHEN (ifnull(aaa.DYHGMLSS,0) - ifnull(bbb.mlss,99999999.99))>0 THEN 1 "; 108 sql += " WHEN ( ifnull( aaa.DYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.DYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
106 sql += " WHEN (ifnull(aaa.EYHGMLSS,0) - ifnull(bbb.mlss,99999999.99) ) >0 THEN 1 "; 109 sql += " WHEN ( ifnull( aaa.EYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.EYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
107 sql += " WHEN (ifnull(aaa.FYHGMLSS,0) - ifnull(bbb.mlss,99999999.99))>0 THEN 1 " + 110 sql += " WHEN ( ifnull( aaa.FYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.FYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 " +
108 " ELSE 0 END AS result from " +dataViewName9bff+ " aaa"; 111 " ELSE 0 END AS result from " +dataViewName9bff+ " aaa ) ccc ";
109 sql += " left join sys_factory_info bbb on bbb.depart_id = aaa.depart_id ) ccc ";
110 sql += " left join sys_depart d on ccc.depart_id = d.id where ccc.result = 1"; 112 sql += " left join sys_depart d on ccc.depart_id = d.id where ccc.result = 1";
111 dataMap = commonSqlService.queryForMap(sql); 113 dataMap = commonSqlService.queryForMap(sql);
112 operationDailyVO.setMlssDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") ); 114 operationDailyVO.setMlssDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
...@@ -192,11 +194,13 @@ public class OperationDailyController { ...@@ -192,11 +194,13 @@ public class OperationDailyController {
192 String dataViewName6643HB = ReportViewUtil.buildView(ReportConstant.view6643,"GSL", departIds, previousDay,previousDay); 194 String dataViewName6643HB = ReportViewUtil.buildView(ReportConstant.view6643,"GSL", departIds, previousDay,previousDay);
193 sql = "select round(sum(ifnull(aaa.GSL,0))/10000,2) GSL from "+dataViewName6643+"aaa "; 195 sql = "select round(sum(ifnull(aaa.GSL,0))/10000,2) GSL from "+dataViewName6643+"aaa ";
194 dataMap = commonSqlService.queryForMap(sql); 196 dataMap = commonSqlService.queryForMap(sql);
195 operationDailyVO.setScgsl( ConvertUtils.getString(dataMap.get("GSL"),"0") );//日报生产供水量 197 //日报生产供水量
198 operationDailyVO.setScgsl( ConvertUtils.getString(dataMap.get("GSL"),"0") );
196 199
197 sql = "select round(sum(ifnull(aaa.GSL,0))/10000,2) GSL from "+dataViewName6643HB+"aaa "; 200 sql = "select round(sum(ifnull(aaa.GSL,0))/10000,2) GSL from "+dataViewName6643HB+"aaa ";
198 dataMap = commonSqlService.queryForMap(sql); 201 dataMap = commonSqlService.queryForMap(sql);
199 operationDailyVO.setIncreaseScgsl( ConvertUtils.getString(dataMap.get("GSL"),"0") );//供水量较昨日增加 202 //供水量较昨日增加
203 operationDailyVO.setIncreaseScgsl( ConvertUtils.getString(dataMap.get("GSL"),"0") );
200 } 204 }
201 return operationDailyVO; 205 return operationDailyVO;
202 } 206 }
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
...@@ -622,6 +622,7 @@ public class EquipmentController { ...@@ -622,6 +622,7 @@ public class EquipmentController {
622 map.put("departId_dictText","depart_id"); 622 map.put("departId_dictText","depart_id");
623 map.put("equipmentType_dictText","equipment_type"); 623 map.put("equipmentType_dictText","equipment_type");
624 map.put("equipmentStatus_dictText","equipment_status"); 624 map.put("equipmentStatus_dictText","equipment_status");
625 map.put("structures_dictText","structures");
625 map.put("equipmentHealthStatus_dictText","equipment_health_status"); 626 map.put("equipmentHealthStatus_dictText","equipment_health_status");
626 if(map.get(filedCode)!=null){ 627 if(map.get(filedCode)!=null){
627 return map.get(filedCode); 628 return map.get(filedCode);
......
sk-module-system/src/main/java/com/skua/modules/system/entity/SysFactoryExpert.java
...@@ -29,6 +29,11 @@ public class SysFactoryExpert { ...@@ -29,6 +29,11 @@ public class SysFactoryExpert {
29 @Excel(name = "对应的系统用户id", width = 15) 29 @Excel(name = "对应的系统用户id", width = 15)
30 @ApiModelProperty(value = "对应的系统用户id") 30 @ApiModelProperty(value = "对应的系统用户id")
31 private String userId; 31 private String userId;
32 /**是否专家*/
33 @Excel(name = "是否专家", width = 15)
34 @ApiModelProperty(value = "是否专家")
35 @Dict(dicCode = "yn")
36 private String isExpert;
32 /**专家等级*/ 37 /**专家等级*/
33 @Excel(name = "专家等级", width = 15) 38 @Excel(name = "专家等级", width = 15)
34 @ApiModelProperty(value = "专家等级") 39 @ApiModelProperty(value = "专家等级")
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!