Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-06-08 d77aa9268ed02e7bda8a67aab2213e42cb5afcf4

Merge remote-tracking branch 'origin/1.1' into 1.1

# Conflicts:
#	management/guns-admin/src/main/resources/redis.properties

 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,18 @@
     * 跳转到修改
     */
    @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);

        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));

        // 查询邀请人
        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/resources/redis.properties

@@ -3,18 +3,18 @@
spring.redis.database=0

## Redis·þÎñÆ÷µØÖ·
#spring.redis.host=127.0.0.1
### Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
#spring.redis.port=16379
### Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
#spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
spring.redis.host=127.0.0.1
## Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
spring.redis.port=16379
## Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ

# Redis·þÎñÆ÷µØÖ·
spring.redis.host=127.0.0.1
# Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
spring.redis.port=6379
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=123456
#spring.redis.host=127.0.0.1
## Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
#spring.redis.port=6379
## Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
#spring.redis.password=123456

# Á¬½Ó³Ø×î´óÁ¬½ÓÊý£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£©
spring.redis.jedis.pool.max-active=1024

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html

@@ -96,6 +96,13 @@

                            <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">
                                </div>
                            </div>

                            <div class="initialLevel col-sm-12 control-label form-group"  >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <span style="color:red">*</span>
                                    <label class="control-label" >驾驶证:</label>
                                    <#uploadImg id="driverLicense"/>
@@ -118,6 +125,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 () {
        var idCardPositive = new $WebUpload("idcardFront");
        idCardPositive.setUploadBarId("progressBar");

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html

@@ -119,6 +119,13 @@
                            </div>

                            <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" style="height: 30px" disabled>
                                </div>
                            </div>

                            <div class="initialLevel col-sm-12 control-label form-group"  >
<!--                                <div class="initialLevel col-sm-3 control-label form-group"  >-->
<!--                                    <span style="color:red">*</span>-->
<!--                                    <label class="control-label" >驾驶证:</label>-->
@@ -204,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('')

 management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js

@@ -150,6 +150,7 @@
    .set('approvalTime')
    .set('serverStatus')
    .set('integral')
    .set('firstCertificateTime')
    .set('status')
        .set('area')
        .set('areaId')
@@ -199,6 +200,7 @@
    },function(data){
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    console.log(this.tDriverInfoData)
    ajax.set(this.tDriverInfoData);
    ajax.start();
}