guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

八项作业不显示扎点

pull/14/head
dearlin 2024-01-18 15:11:33 +08:00
parent 8883f58af7
commit 5678f4451d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java
View File

@ -51,7 +51,7 @@ public class CzksMapEightController extends BaseController {
public Object findFormCount() throws Exception { public Object findFormCount() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = this.getPageData(); PageData pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd);
@ -99,6 +99,12 @@ public class CzksMapEightController extends BaseController {
} else { } else {
varList = mapEightService.listAllHighRiskWorkLocationOrder(pd); varList = mapEightService.listAllHighRiskWorkLocationOrder(pd);
} }
// 处理一下 name 的问题
if (varList != null) {
varList.forEach(item -> {
item.put("MAP_POINT_NAME", item.getString("NAME"));
});
}
map.put("varList", varList); map.put("varList", varList);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;

6
src/main/resources/application-dev.properties
View File

@ -92,10 +92,10 @@ mq.group.docking=scheduled_tasks_docking
perLoc.url=http://172.16.130.86/gateway-service perLoc.url=http://172.16.130.86/gateway-service
perLoc.userName=qaaqadmin perLoc.userName=qaaqadmin
perLoc.pwd=Cfd2023@ perLoc.pwd=Cfd2023@
corp.default.pic-path=https://qgqy.qhdsafety.com/ corp.default.pic-path=https://wwag.qhdsafety.com/file/
corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ corp.default.back-end-path=https://wwag.qhdsafety.com/file/
http.file.url=https://qgqy.qhdsafety.com/file/ http.file.url=https://wwag.qhdsafety.com/file/
#???????????? #????????????
baseimgpath =https://wwag.qhdsafety.com/file/ baseimgpath =https://wwag.qhdsafety.com/file/
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd