From f6199e6c908b5499f8cac9bd897168879c4214ac Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 07 六月 2023 20:24:24 +0800
Subject: [PATCH] 司机修改
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 2 +-
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 105d4af..4c6f5ce 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -136,9 +136,11 @@
TDriverResp tDriverResp = new TDriverResp();
BeanUtils.copyProperties(tDriver,tDriverResp);
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- String format1 = format.format(tDriverResp.getFirstCertificateTime());
- tDriverResp.setFirstCertificateTimeStr(format1);
+ if(Objects.nonNull(tDriverResp.getFirstCertificateTime())){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String format1 = format.format(tDriverResp.getFirstCertificateTime());
+ tDriverResp.setFirstCertificateTimeStr(format1);
+ }
// tDriverResp.setFirstCertificateTime(format.parse(format1));
// 查询邀请人
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 6b2256f..c13c46b 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -121,7 +121,7 @@
<div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >驾驶证初次领证时间:</label>
- <input id="firstCertificateTime" name="firstCertificateTime" value="${item.firstCertificateTimeStr}" type="text" placeholder="请选择时间" style="height: 30px" disabled>
+ <input id="firstCertificateTime" name="firstCertificateTime" value="${item.firstCertificateTimeStr}" type="text" style="height: 30px" disabled>
</div>
</div>
--
Gitblit v1.7.1