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

优化BUG 从业人员选择已有人员 用户管理 人脸

dev
xiepeng 2024-07-03 10:51:46 +08:00
parent d175fbe30a
commit 3aa277d501
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java
View File

@ -127,9 +127,9 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE")); Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE"));
if (shippingDate != null && shippingDate.after(new Date())) { if (shippingDate != null && shippingDate.after(new Date())) {
pd.put("WAYBILLSTATUS", "1");
} else {
pd.put("WAYBILLSTATUS", "3"); pd.put("WAYBILLSTATUS", "3");
} else {
pd.put("WAYBILLSTATUS", "1");
} }
trafficSecurityWaybillRegistrationService.save(pd); trafficSecurityWaybillRegistrationService.save(pd);
@ -284,6 +284,12 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
if(!ObjectUtil.isEmpty(vehicle)) { if(!ObjectUtil.isEmpty(vehicle)) {
pd.put("TRANSPORTVEHICLE", vehicle.getString("OPERATING_ID")); 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); trafficSecurityWaybillRegistrationService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);

2
src/main/java/com/zcloud/controller/system/AppUsersController.java
View File

@ -144,7 +144,7 @@ public class AppUsersController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String errInfo = "success"; String errInfo = "success";
pd.put("CORPINFO_ID", "13cf0f4ec77e4d98ae8cdd9c3386ae0c"); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> byUserId = userCorpService.findByUserId(pd); List<PageData> byUserId = userCorpService.findByUserId(pd);
map.put("pd", byUserId.get(0)); map.put("pd", byUserId.get(0));
map.put("result", errInfo); map.put("result", errInfo);