wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

优化BUG

dev
xiepeng 2024-06-04 11:03:41 +08:00
parent 87eb2f9857
commit 0d7b34fe6e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java
View File

@ -258,6 +258,19 @@ public class TrafficSecurityNoticeController extends BaseController {
pd.put("VIDEO_NAME",pd.getString("CREATORNAME")); pd.put("VIDEO_NAME",pd.getString("CREATORNAME"));
} }
if(StringUtils.equals(pd.getString("allStatus"), "1")) {
PageData data = new PageData();
data.put("CORPINFO_ID", pd.getString("CORPINFO_ID"));
List<PageData> allUser = usersService.getAllUser(data);
System.out.println("allUser = " + allUser);
String userIds = "";
for (PageData pageData : allUser) {
userIds = userIds + pageData.getString("USER_ID") + ",";
}
userIds = userIds.substring(0, userIds.length() - 1);
pd.put("PERSON_ID", userIds);
}
pd.put("SIGNING", "0"); // 签收情况 pd.put("SIGNING", "0"); // 签收情况
pd.put("REPLY", "0"); // 回复情况 pd.put("REPLY", "0"); // 回复情况
securityNoticeService.edit(pd); securityNoticeService.edit(pd);

4
src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java
View File

@ -235,7 +235,8 @@ public class TaxationManageController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd); page.setPd(pd);
List<PageData> freightTrailerList = freightTrailerService.list(page); // 列出所有挂车列表 String corpId = Jurisdiction.getCORPINFO_ID();
List<PageData> freightTrailerList = freightTrailerService.getPulldownVehicleList(corpId);
List<PageData> taxationList = taxationManageService.taxationList(pd.getString("CORPINFO_ID")); // 列出车船税列表 List<PageData> taxationList = taxationManageService.taxationList(pd.getString("CORPINFO_ID")); // 列出车船税列表
List<PageData> varList = new ArrayList<>(); List<PageData> varList = new ArrayList<>();
@ -247,7 +248,6 @@ public class TaxationManageController extends BaseController {
} else { } else {
varList = freightTrailerList; varList = freightTrailerList;
} }
// 过滤掉车船税下拉列表中已报废的车辆信息 // 过滤掉车船税下拉列表中已报废的车辆信息
List<PageData> choiceTrailerList = varList.stream().filter(data -> !"1".equals(data.get("ISSCRAP"))).collect(Collectors.toList()); List<PageData> choiceTrailerList = varList.stream().filter(data -> !"1".equals(data.get("ISSCRAP"))).collect(Collectors.toList());
map.put("varList", choiceTrailerList); map.put("varList", choiceTrailerList);