From 57a99060441cd4dbf33f78ce0a59954a13bc34ea Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 07 六月 2023 20:15:20 +0800
Subject: [PATCH] 代理商修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverResp.java | 9 +++++++++
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 10 +++++++++-
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 2 ++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 9 ++++++++-
4 files changed, 28 insertions(+), 2 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 eeb4c9d..105d4af 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
@@ -31,6 +31,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
@@ -48,6 +49,7 @@
import java.io.OutputStream;
import java.math.BigDecimal;
import java.text.DateFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Period;
@@ -129,11 +131,16 @@
* 跳转到修改
*/
@RequestMapping("/tDriver_update")
- public String tDriverUpdate( Integer tDriverId, Model model) {
+ public String tDriverUpdate( Integer tDriverId, Model model) throws ParseException {
TDriver tDriver = tDriverService.selectById(tDriverId);
TDriverResp tDriverResp = new TDriverResp();
BeanUtils.copyProperties(tDriver,tDriverResp);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String format1 = format.format(tDriverResp.getFirstCertificateTime());
+ tDriverResp.setFirstCertificateTimeStr(format1);
+// tDriverResp.setFirstCertificateTime(format.parse(format1));
+
// 查询邀请人
TDriver tDriver1 = tDriverService.selectById(tDriver.getInviterId());
if(Objects.nonNull(tDriver1)){
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverResp.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverResp.java
index 3230778..2bc1be0 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverResp.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverResp.java
@@ -37,6 +37,15 @@
@ApiModelProperty(value = "加盟区域ID")
private String areaId;
+ private String firstCertificateTimeStr;
+
+ public String getFirstCertificateTimeStr() {
+ return firstCertificateTimeStr;
+ }
+
+ public void setFirstCertificateTimeStr(String firstCertificateTimeStr) {
+ this.firstCertificateTimeStr = firstCertificateTimeStr;
+ }
@Override
public String getAreaId() {
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index 3131227..af3c879 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -170,6 +171,7 @@
private String areaName;
@ApiModelProperty(value = "驾驶证初次领证时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date firstCertificateTime;
@ApiModelProperty(value = "佣金")
private BigDecimal commission;
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 449b111..6b2256f 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" type="text" placeholder="请选择时间" style="height: 30px" disabled>
+ <input id="firstCertificateTime" name="firstCertificateTime" value="${item.firstCertificateTimeStr}" type="text" placeholder="请选择时间" style="height: 30px" disabled>
</div>
</div>
@@ -211,6 +211,14 @@
<script src="${ctxPath}/static/modular/system/tDriver/tDriver_info.js"></script>
<script src="${ctxPath}/static/modular/system/tDriver/tDriver.js"></script>
<script type="text/javascript">
+
+ laydate.render({
+ elem: '#firstCertificateTime',
+ type: 'date',
+ range: false,
+ max: Date.now()
+ });
+
$(function () {
if('' == $("#inviterName").val()){
$("#inviterName").val('')
--
Gitblit v1.7.1