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

14906 后续审批列表 字段缺少值 参考申请作业票列表 所有列表页都要改 注意是所有的就不多提BUG了

liujun-2024-05-23-接口漏洞修复
liujun 2024-04-03 15:19:59 +08:00
parent 479fa26e27
commit 5ab7c02a97
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java
View File

@ -1581,6 +1581,10 @@ public class AppHotworkCfdController extends BaseController {
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd); page.setPd(pd);
List<PageData> varList = hotworkCfdService.jslist(page); //列出confinedspace列表 List<PageData> varList = hotworkCfdService.jslist(page); //列出confinedspace列表
// created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人
for(PageData dto: varList){
hotworkCfdService.addInfo(dto);
}
map.put("varList", varList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);
@ -1771,6 +1775,10 @@ public class AppHotworkCfdController extends BaseController {
PageData request = this.getPageData(); PageData request = this.getPageData();
page.setPd(request); page.setPd(request);
List<PageData> varList = hotworkCfdService.safetyList(page); List<PageData> varList = hotworkCfdService.safetyList(page);
// created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人
for(PageData dto: varList){
hotworkCfdService.addInfo(dto);
}
response.put("varList", varList); response.put("varList", varList);
response.put("page", page); response.put("page", page);
response.put("result", "success"); response.put("result", "success");