xuhy
2 天以前 d31a443dbe30e9051abbd0e45c91ecb1d386b17d
修改配置,修改司机信息
5个文件已修改
100 ■■■■ 已修改文件
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementNTTravel/guns-admin/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -157,6 +157,14 @@
     */
    private Integer taxiDriver;
    /**
     * 是否客运驾驶员(0:否,1:是)
     */
    private Integer passengerDriver;
    /**
     * 是否公交驾驶员(0:否,1:是)
     */
    private Integer transitDriver;
    /**
     * 出租车资格证号
     */
    private String taxiAptitudeCard;
@@ -197,7 +205,7 @@
     */
    private Integer inDriverBlacklist;
    /**
     * 服务类型(1:网络预约出租汽车,2:巡游出租汽车,3:私人小客车合乘)
     * 服务类型(1:客运,2:公交,3:出租车)
     */
    private Integer commercialType;
    /**
@@ -296,6 +304,30 @@
     */
    private Date lastFacialTime;
    public Integer getPassengerDriver() {
        return passengerDriver;
    }
    public void setPassengerDriver(Integer passengerDriver) {
        this.passengerDriver = passengerDriver;
    }
    public Integer getTransitDriver() {
        return transitDriver;
    }
    public void setTransitDriver(Integer transitDriver) {
        this.transitDriver = transitDriver;
    }
    public Double getLaveActivityMoney() {
        return laveActivityMoney;
    }
    public void setLaveActivityMoney(Double laveActivityMoney) {
        this.laveActivityMoney = laveActivityMoney;
    }
    public Integer getFailCount() {
        return failCount;
    }
ManagementNTTravel/guns-admin/src/main/resources/application.yml
@@ -74,7 +74,7 @@
  datasource:
    url: jdbc:mysql://127.0.0.1:10633/hqtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: HuanQiu@2024!
    password: HuanQiu@2025!
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -63,8 +63,8 @@
                    <#input id="driverAge" name="驾龄" />
                    <#input id="idCard" name="身份证号" />
                    <#input id="driverAddress" name="居住地址" />
                    <#input id="taxiAptitudeCard" name="出租车资格证号" />
                    <#avatar id="networkCarlssueImg" name="网约车资格证照片:" />
                    <#input id="taxiAptitudeCard" name="资格证号" />
                    <#avatar id="networkCarlssueImg" name="驾驶员资格证照片:" />
                    <#input id="jobNumber" name="工号(选填)" />
                    <div class="form-group">
                        <fieldset>
@@ -163,7 +163,25 @@
                    <#input id="driverLicenseOn" name="驾驶证有效期限起"/>
                    <#input id="driverLicenseOff" name="驾驶证有效期限止"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">是否巡游出租车驾驶员:</label>
                        <label class="col-sm-3 control-label">是否客运驾驶员:</label>
                        <div class="col-sm-3">
                            <select class="form-control" id="passengerDriver">
                                <option value="0">否</option>
                                <option value="1">是</option>
                            </select>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">是否公交驾驶员:</label>
                        <div class="col-sm-3">
                            <select class="form-control" id="transitDriver">
                                <option value="0">否</option>
                                <option value="1">是</option>
                            </select>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">是否出租车驾驶员:</label>
                        <div class="col-sm-3">
                            <select class="form-control" id="taxiDriver">
                                <option value="0">否</option>
@@ -171,7 +189,7 @@
                            </select>
                        </div>
                    </div>
                    <#input id="networkCarlssueOrganization" name="网络预约出租车驾驶员证发证机构"/>
                    <#input id="networkCarlssueOrganization" name="驾驶员证发证机构"/>
                    <#input id="networkCarlssueDate" name="资格证发证日期"/>
                    <#input id="getNetworkCarProofDate" name="初次认领资格证日期"/>
                    <#input id="networkCarProofOn" name="资格证有效起始日期"/>
@@ -199,9 +217,9 @@
                        <label class="col-sm-3 control-label">服务类型:</label>
                        <div class="col-sm-3">
                            <select class="form-control" id="commercialType">
                                <option value="1">网络预约出租汽车</option>
                                <option value="2">巡游出租汽车</option>
                                <option value="3">私人小客车合乘</option>
                                <option value="1">客运</option>
                                <option value="2">公交</option>
                                <option value="3">出租车</option>
                            </select>
                        </div>
                    </div>
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -67,7 +67,7 @@
                    <#input id="driverAge" name="驾龄"  value="${item.driverAge}"/>
                    <#input id="idCard" name="身份证号" value="${item.idCard}"/>
                    <#input id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
                    <#input id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
                    <#input id="taxiAptitudeCard" name="资格证号" value="${item.taxiAptitudeCard}"/>
                    <#input id="jobNumber" name="工号(选填)" value="${item.jobNumber}"/>
                    <div class="form-group">
                        <fieldset>
@@ -173,7 +173,25 @@
                    <#input id="driverLicenseOn" name="驾驶证有效期限起" value="${item.driverLicenseOn}"/>
                    <#input id="driverLicenseOff" name="驾驶证有效期限止" value="${item.driverLicenseOff}"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">是否巡游出租车驾驶员:</label>
                        <label class="col-sm-3 control-label">是否客运驾驶员:</label>
                        <div class="col-sm-3">
                            <select class="form-control" id="passengerDriver">
                                <option value="0" ${item.passengerDriver == 0 ? 'selected' : ''}>否</option>
                                <option value="1" ${item.passengerDriver == 1 ? 'selected' : ''}>是</option>
                            </select>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">是否公交驾驶员:</label>
                        <div class="col-sm-3">
                            <select class="form-control" id="transitDriver">
                                <option value="0" ${item.transitDriver == 0 ? 'selected' : ''}>否</option>
                                <option value="1" ${item.transitDriver == 1 ? 'selected' : ''}>是</option>
                            </select>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">是否出租车驾驶员:</label>
                        <div class="col-sm-3">
                            <select class="form-control" id="taxiDriver">
                                <option value="0" ${item.taxiDriver == 0 ? 'selected' : ''}>否</option>
@@ -181,7 +199,7 @@
                            </select>
                        </div>
                    </div>
                    <#input id="networkCarlssueOrganization" name="网络预约出租车驾驶员证发证机构" value="${item.networkCarlssueOrganization}"/>
                    <#input id="networkCarlssueOrganization" name="驾驶员证发证机构" value="${item.networkCarlssueOrganization}"/>
                    <#input id="networkCarlssueDate" name="资格证发证日期" value="${item.networkCarlssueDate}"/>
                    <#input id="getNetworkCarProofDate" name="初次认领资格证日期" value="${item.getNetworkCarProofDate}"/>
                    <#input id="networkCarProofOn" name="资格证有效起始日期" value="${item.networkCarProofOn}"/>
@@ -209,9 +227,9 @@
                        <label class="col-sm-3 control-label">服务类型:</label>
                        <div class="col-sm-3">
                            <select class="form-control" id="commercialType">
                                <option value="1" ${item.commercialType == 1 ? 'selected' : ''}>网络预约出租汽车</option>
                                <option value="2" ${item.commercialType == 2 ? 'selected' : ''}>巡游出租汽车</option>
                                <option value="3" ${item.commercialType == 3 ? 'selected' : ''}>私人小客车合乘</option>
                                <option value="1" ${item.commercialType == 1 ? 'selected' : ''}>客运</option>
                                <option value="2" ${item.commercialType == 2 ? 'selected' : ''}>公交</option>
                                <option value="3" ${item.commercialType == 3 ? 'selected' : ''}>出租车</option>
                            </select>
                        </div>
                    </div>
ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
@@ -79,6 +79,8 @@
    .set('driverLicenseOn')
    .set('driverLicenseOff')
    .set('taxiDriver')
    .set('passengerDriver')
    .set('transitDriver')
    .set('taxiAptitudeCard')
    .set('networkCarlssueImg')
    .set('networkCarlssueOrganization')