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

Merge remote-tracking branch 'origin/lmy20231211' into 相关方关联分公司功能

pull/4/head
zhaoyu 2023-12-14 18:48:24 +08:00
parent 190f0dc838 f53539025c
commit c972e6c9c7
2 changed files with 77 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java
View File

@ -88,15 +88,16 @@ public class AppHomeController extends BaseController {
if(!Tools.isEmpty(pd.get("USER_ID"))){ if(!Tools.isEmpty(pd.get("USER_ID"))){
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID")); varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID")); PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
if (varList.size() > 0) { if (varList.size() > 0) {
boolean isDelayedExist = false; boolean isDelayedExist = false;
for (PageData data : varList) { for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true; if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true;
} }
if (isDelayedExist) { if (isDelayedExist) {
for (PageData pageData : varList){ for (PageData pageData : varList) {
if (StringUtils.equals(pageData.getString("STATE"),"10")) { if (StringUtils.equals(pageData.getString("STATE"), "10")) {
pageData.put("count",delayedCount.getString("count")); pageData.put("count", delayedCount.getString("count"));
} }
} }
} else { } else {
@ -105,6 +106,7 @@ public class AppHomeController extends BaseController {
} else { } else {
varList.add(delayedCount); varList.add(delayedCount);
} }
}
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID")); myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
} }
map.put("result", errInfo); map.put("result", errInfo);
@ -146,15 +148,16 @@ public class AppHomeController extends BaseController {
if(!Tools.isEmpty(pd.get("USER_ID"))){ if(!Tools.isEmpty(pd.get("USER_ID"))){
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID")); varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID")); PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
if (varList.size() > 0) { if (varList.size() > 0) {
boolean isDelayedExist = false; boolean isDelayedExist = false;
for (PageData data : varList) { for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true; if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true;
} }
if (isDelayedExist) { if (isDelayedExist) {
for (PageData pageData : varList){ for (PageData pageData : varList) {
if (StringUtils.equals(pageData.getString("STATE"),"10")) { if (StringUtils.equals(pageData.getString("STATE"), "10")) {
pageData.put("count",delayedCount.getString("count")); pageData.put("count", delayedCount.getString("count"));
} }
} }
} else { } else {
@ -163,6 +166,7 @@ public class AppHomeController extends BaseController {
} else { } else {
varList.add(delayedCount); varList.add(delayedCount);
} }
}
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID")); myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
} }

4
src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
View File

@ -746,6 +746,7 @@ public class AppHotWorkApplicationController extends BaseController {
} }
} }
PageData hotUser = new PageData(); PageData hotUser = new PageData();
if (hotIds.size() > 0) {
hotUser.put("hotIds", hotIds); hotUser.put("hotIds", hotIds);
List<PageData> hotUserAllList = hotWorkApplicationUserService.listAll(hotUser); List<PageData> hotUserAllList = hotWorkApplicationUserService.listAll(hotUser);
for (PageData userPageData : hotUserAllList){ for (PageData userPageData : hotUserAllList){
@ -785,6 +786,7 @@ public class AppHotWorkApplicationController extends BaseController {
} }
} }
} }
}
map.put("varList", varList); map.put("varList", varList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);
@ -1361,6 +1363,7 @@ public class AppHotWorkApplicationController extends BaseController {
if(!Tools.isEmpty(pd.get("USER_ID"))){ if(!Tools.isEmpty(pd.get("USER_ID"))){
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID")); varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID")); PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
if (varList.size() > 0) { if (varList.size() > 0) {
boolean isDelayedExist = false; boolean isDelayedExist = false;
for (PageData data : varList) { for (PageData data : varList) {
@ -1378,6 +1381,7 @@ public class AppHotWorkApplicationController extends BaseController {
} else { } else {
varList.add(delayedCount); varList.add(delayedCount);
} }
}
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID")); myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
} }
map.put("varList", varList); map.put("varList", varList);