xuhy
2023-06-07 57a99060441cd4dbf33f78ce0a59954a13bc34ea
代理商修改
4个文件已修改
30 ■■■■■ 已修改文件
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverResp.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)){
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() {
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;
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('')