From 54af05ded609f2148e1fabfb1b22b553d71f1bcb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 六月 2025 22:16:43 +0800
Subject: [PATCH] 新增加字段
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java | 2
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js | 9 ++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 14 ++-
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 146 ++++++++++++++++++------------------
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java | 12 +++
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html | 6 +
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js | 5 +
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 6 -
8 files changed, 114 insertions(+), 86 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java
index ad1e50e..af628be 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java
@@ -11,7 +11,7 @@
* @date 2017-07-13 21:05
*/
@Configuration
-@EnableRedisHttpSession(maxInactiveIntervalInSeconds = 172800) //session过期时间 如果部署多机环境,需要打开注释
+@EnableRedisHttpSession(maxInactiveIntervalInSeconds = 86400) //session过期时间 如果部署多机环境,需要打开注释
@ConditionalOnProperty(prefix = "guns", name = "spring-session-open", havingValue = "true")
public class SpringSessionConfig {
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
index 203479d..b6cd352 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -145,12 +145,6 @@
ne1.eq("companyId", companyId).or().eq("franchiseeId", companyId);
}
List<TDriver> tDrivers = tDriverService.selectList(ne1);
- String keys = "";
- for(TDriver driver : tDrivers){
- keys += "DRIVER" + driver.getId() + ",";
- }
- String value = (String)redisTemplate.opsForValue().get(keys.substring(0, keys.length() - 1));
- JSONArray jsonArray = JSON.parseArray(value);
int size = driverOnlineService.queryOnlineDriverCount(null, null);
map1.put("netcardriver", size); //在线司机
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index aed49e9..eabfa7b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -145,12 +145,14 @@
returnList.add(carModel);
}
}
- TServerCarmodel carModel = new TServerCarmodel();
- carModel.setId(type.getId());
- carModel.setName(type.getName());
- carModel.setIsCheck(type.getIsCheck().equals("1") ? "是":"否");
- carModel.setPriceType(null);
- returnList.add(carModel);
+ if(null != type){
+ TServerCarmodel carModel = new TServerCarmodel();
+ carModel.setId(type.getId());
+ carModel.setName(type.getName());
+ carModel.setIsCheck(type.getIsCheck().equals("1") ? "是":"否");
+ carModel.setPriceType(null);
+ returnList.add(carModel);
+ }
return returnList;
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
index e0564a4..5ed74e6 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
@@ -223,6 +223,10 @@
*/
private String passengersPhone;
/**
+ * 联系人电话
+ */
+ private String contactPersonPhone;
+ /**
* 备注
*/
private String remark;
@@ -852,6 +856,14 @@
this.bindId = bindId;
}
+ public String getContactPersonPhone() {
+ return contactPersonPhone;
+ }
+
+ public void setContactPersonPhone(String contactPersonPhone) {
+ this.contactPersonPhone = contactPersonPhone;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
index 19c4d3c..578e6e3 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
@@ -51,6 +51,12 @@
<input class="form-control" id="passengersPhone">
</div>
</div>
+ <div class="form-group">
+ <label class="control-label col-sm-2">联系人手机号：</label>
+ <div class="col-sm-3">
+ <input class="form-control" id="contactPersonPhone">
+ </div>
+ </div>
<!-- <div class="form-group">-->
<!-- <label class="control-label col-sm-2">备注信息：</label>-->
<!-- <div class="col-sm-3">-->
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
index f301b58..ec5605f 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -59,79 +59,79 @@
</div>
<div style="float: left;width: 1200px;margin-left: 50px;">
<div class="pushOrderSettings">
- <div class="form-group">
- <label class="col-sm-2 control-label">快车推单：</label>
- <div class="col-sm-10">
- 第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(zcOne)){
- value="${zcOne.pushDistance}"
- @}else{
- value=""
- @}
- name="zc1" id="zc1" class="form-control newWidth" /> 公里，
- 推单时间为 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(zcOne)){
- value="${zcOne.pushTime}"
- @}else{
- value=""
- @}
- name="zc2" id="zc2" class="form-control newWidth" /> 秒钟；
- 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(zcOne)){
- value="${zcOne.driverProportion}"
- @}else{
- value=""
- @}
- name="zc3" id="zc3" class="form-control newWidth" /> %
- <br/>
- <br/>
- 第二轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(zcTwo)){
- value="${zcTwo.pushDistance}"
- @}else{
- value=""
- @}
- name="zc4" id="zc4" class="form-control newWidth" /> 公里，
- 推单时间为 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(zcTwo)){
- value="${zcTwo.pushTime}"
- @}else{
- value=""
- @}
- name="zc5" id="zc5" class="form-control newWidth" /> 秒钟；
- 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(zcTwo)){
- value="${zcTwo.driverProportion}"
- @}else{
- value=""
- @}
- name="zc6" id="zc6" class="form-control newWidth" /> %
- <br/>
- <br/>
- 第三轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(zcThree)){
- value="${zcThree.pushDistance}"
- @}else{
- value=""
- @}
- name="zc7" id="zc7" class="form-control newWidth" /> 公里，
- 推单时间为 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(zcThree)){
- value="${zcThree.pushTime}"
- @}else{
- value=""
- @}
- name="zc8" id="zc8" class="form-control newWidth" /> 秒钟；
- 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(zcThree)){
- value="${zcThree.driverProportion}"
- @}else{
- value=""
- @}
- name="zc9" id="zc9" class="form-control newWidth" /> %
- <br/>
- </div>
- </div>
+ <!--<div class="form-group">-->
+ <!--<label class="col-sm-2 control-label">快车推单：</label>-->
+ <!--<div class="col-sm-10">-->
+ <!--第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"-->
+ <!--@if(isNotEmpty(zcOne)){-->
+ <!--value="${zcOne.pushDistance}"-->
+ <!--@}else{-->
+ <!--value=""-->
+ <!--@}-->
+ <!--name="zc1" id="zc1" class="form-control newWidth" /> 公里，-->
+ <!--推单时间为 <input type="text" oninput="checkIsInt(this)"-->
+ <!--@if(isNotEmpty(zcOne)){-->
+ <!--value="${zcOne.pushTime}"-->
+ <!--@}else{-->
+ <!--value=""-->
+ <!--@}-->
+ <!--name="zc2" id="zc2" class="form-control newWidth" /> 秒钟；-->
+ <!--每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"-->
+ <!--@if(isNotEmpty(zcOne)){-->
+ <!--value="${zcOne.driverProportion}"-->
+ <!--@}else{-->
+ <!--value=""-->
+ <!--@}-->
+ <!--name="zc3" id="zc3" class="form-control newWidth" /> %-->
+ <!--<br/>-->
+ <!--<br/>-->
+ <!--第二轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"-->
+ <!--@if(isNotEmpty(zcTwo)){-->
+ <!--value="${zcTwo.pushDistance}"-->
+ <!--@}else{-->
+ <!--value=""-->
+ <!--@}-->
+ <!--name="zc4" id="zc4" class="form-control newWidth" /> 公里，-->
+ <!--推单时间为 <input type="text" oninput="checkIsInt(this)"-->
+ <!--@if(isNotEmpty(zcTwo)){-->
+ <!--value="${zcTwo.pushTime}"-->
+ <!--@}else{-->
+ <!--value=""-->
+ <!--@}-->
+ <!--name="zc5" id="zc5" class="form-control newWidth" /> 秒钟；-->
+ <!--每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"-->
+ <!--@if(isNotEmpty(zcTwo)){-->
+ <!--value="${zcTwo.driverProportion}"-->
+ <!--@}else{-->
+ <!--value=""-->
+ <!--@}-->
+ <!--name="zc6" id="zc6" class="form-control newWidth" /> %-->
+ <!--<br/>-->
+ <!--<br/>-->
+ <!--第三轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"-->
+ <!--@if(isNotEmpty(zcThree)){-->
+ <!--value="${zcThree.pushDistance}"-->
+ <!--@}else{-->
+ <!--value=""-->
+ <!--@}-->
+ <!--name="zc7" id="zc7" class="form-control newWidth" /> 公里，-->
+ <!--推单时间为 <input type="text" oninput="checkIsInt(this)"-->
+ <!--@if(isNotEmpty(zcThree)){-->
+ <!--value="${zcThree.pushTime}"-->
+ <!--@}else{-->
+ <!--value=""-->
+ <!--@}-->
+ <!--name="zc8" id="zc8" class="form-control newWidth" /> 秒钟；-->
+ <!--每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"-->
+ <!--@if(isNotEmpty(zcThree)){-->
+ <!--value="${zcThree.driverProportion}"-->
+ <!--@}else{-->
+ <!--value=""-->
+ <!--@}-->
+ <!--name="zc9" id="zc9" class="form-control newWidth" /> %-->
+ <!--<br/>-->
+ <!--</div>-->
+ <!--</div>-->
<div class="form-group">
<label class="col-sm-2 control-label">出租车推单：</label>
<div class="col-sm-10">
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js
index 7a65252..67f39e0 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js
@@ -102,6 +102,15 @@
return btn;
}
},
+ {title: '联系人手机', field: 'contactPersonPhone', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.contactPersonPhone != '' && row.contactPersonPhone != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.contactPersonPhone + '" onfocus="TUser.tooltip()">' + row.contactPersonPhone + '</p>']
+ }
+ return btn;
+ }
+ },
{title: '起点', field: 'startAddress', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
var btn = "";
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js
index 7c0dc2d..89ef7cd 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js
@@ -84,6 +84,7 @@
.set('substitute')
.set('passengers')
.set('passengersPhone')
+ .set('contactPersonPhone')
.set('state')
.set('insertTime')
.set('travelTime')
@@ -127,6 +128,10 @@
Feng.error("请输入乘车人手机号");
return false;
}
+ if ($("#contactPersonPhone").val() === ""){
+ Feng.error("请输入联系人手机号");
+ return false;
+ }
// if ($("#remark").val() === ""){
// Feng.error("请输入备注信息");
// return false;
--
Gitblit v1.7.1