From 0d7b34fe6e15165c8c9d9ed1c37a5d71db3c0d60 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 4 Jun 2024 11:03:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficSecurityNoticeController.java | 13 +++++++++++++ .../taxationManage/TaxationManageController.java | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java index b53226e..83bd675 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java @@ -258,6 +258,19 @@ public class TrafficSecurityNoticeController extends BaseController { 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 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("REPLY", "0"); // 回复情况 securityNoticeService.edit(pd); diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index 4bb4358..cafcb28 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -235,7 +235,8 @@ public class TaxationManageController extends BaseController { pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); - List freightTrailerList = freightTrailerService.list(page); // 列出所有挂车列表 + String corpId = Jurisdiction.getCORPINFO_ID(); + List freightTrailerList = freightTrailerService.getPulldownVehicleList(corpId); List taxationList = taxationManageService.taxationList(pd.getString("CORPINFO_ID")); // 列出车船税列表 List varList = new ArrayList<>(); @@ -247,7 +248,6 @@ public class TaxationManageController extends BaseController { } else { varList = freightTrailerList; } - // 过滤掉车船税下拉列表中已报废的车辆信息 List choiceTrailerList = varList.stream().filter(data -> !"1".equals(data.get("ISSCRAP"))).collect(Collectors.toList()); map.put("varList", choiceTrailerList);