From 3aa277d501477aafc66961533318d31b38991dc2 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 3 Jul 2024 10:51:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96BUG=20=E4=BB=8E=E4=B8=9A?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9=E5=B7=B2=E6=9C=89=E4=BA=BA?= =?UTF-8?q?=E5=91=98=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=20=E4=BA=BA?= =?UTF-8?q?=E8=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficSecurityWaybillRegistrationController.java | 10 ++++++++-- .../zcloud/controller/system/AppUsersController.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 45a5516..4e967b4 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -127,9 +127,9 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE")); if (shippingDate != null && shippingDate.after(new Date())) { - pd.put("WAYBILLSTATUS", "1"); - } else { pd.put("WAYBILLSTATUS", "3"); + } else { + pd.put("WAYBILLSTATUS", "1"); } trafficSecurityWaybillRegistrationService.save(pd); @@ -284,6 +284,12 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController if(!ObjectUtil.isEmpty(vehicle)) { pd.put("TRANSPORTVEHICLE", vehicle.getString("OPERATING_ID")); } + Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE")); + if (shippingDate != null && shippingDate.after(new Date())) { + pd.put("WAYBILLSTATUS", "3"); + } else { + pd.put("WAYBILLSTATUS", "1"); + } trafficSecurityWaybillRegistrationService.edit(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/system/AppUsersController.java b/src/main/java/com/zcloud/controller/system/AppUsersController.java index 6712162..3452e75 100644 --- a/src/main/java/com/zcloud/controller/system/AppUsersController.java +++ b/src/main/java/com/zcloud/controller/system/AppUsersController.java @@ -144,7 +144,7 @@ public class AppUsersController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); String errInfo = "success"; - pd.put("CORPINFO_ID", "13cf0f4ec77e4d98ae8cdd9c3386ae0c"); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List byUserId = userCorpService.findByUserId(pd); map.put("pd", byUserId.get(0)); map.put("result", errInfo);