ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -63,6 +63,9 @@ @Autowired private ITCarModelService modelService; @Autowired private ITSysDistanceDisplayService tSysDistanceDisplayService; @RequestMapping("/check") public String check(Model model) { return PREFIX + "tStudentEdit_first.html"; @@ -173,6 +176,8 @@ //人脸识别 TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId())); model.addAttribute("faceDistinguish",faceDistinguish); TSysDistanceDisplay distanceDisplay = tSysDistanceDisplayService.selectOne(new EntityWrapper<TSysDistanceDisplay>().eq("companyId", ShiroKit.getUser().getObjectId())); model.addAttribute("distanceDisplay", distanceDisplay); //快车推单(第一轮) TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1)); @@ -321,7 +326,7 @@ Double percentage, Integer timeOut, Double deductMoney, Integer sjzp1, Integer sjzp2, Integer zuc1, Integer zuc2, Integer mc1, Integer mc2, Integer czgrcl1, Integer czgrcl2, Integer mac1, Integer mac2, Integer sjzx1, Integer sjzx2, Integer dck1, Integer dck2,Integer driverDays,Integer pushType) { Integer dck1, Integer dck2,Integer driverDays,Integer pushType, BigDecimal passengerLocationDistance) { Integer companyId = ShiroKit.getUser().getObjectId(); boolean companySystemSet = openCityId == null; //改派设置 @@ -359,6 +364,22 @@ if (companySystemSet) { openCityId = companyId; } if("distanceDisplaySettings".equals(type)){ TSysDistanceDisplay distanceDisplay = tSysDistanceDisplayService.selectOne(new EntityWrapper<TSysDistanceDisplay>().eq("companyId", companyId)); if (SinataUtil.isNotEmpty(distanceDisplay)){ distanceDisplay.setPassengerLocationDistance(passengerLocationDistance); distanceDisplay.setUpdateTime(new Date()); tSysDistanceDisplayService.updateById(distanceDisplay); }else { distanceDisplay = new TSysDistanceDisplay(); distanceDisplay.setCompanyId(companyId); distanceDisplay.setPassengerLocationDistance(passengerLocationDistance); Date now = new Date(); distanceDisplay.setInsertTime(now); distanceDisplay.setUpdateTime(now); tSysDistanceDisplayService.insert(distanceDisplay); } } if("driverPayDays".equals(type)){ TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("openCityId", openCityId)); if (SinataUtil.isNotEmpty(tDriverPayDays)){ ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysDistanceDisplayMapper.java
New file @@ -0,0 +1,13 @@ package com.stylefeng.guns.modular.system.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.stylefeng.guns.modular.system.model.TSysDistanceDisplay; /** * <p> * 系统设置-距离展示 Mapper 接口 * </p> */ public interface TSysDistanceDisplayMapper extends BaseMapper<TSysDistanceDisplay> { } ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysDistanceDisplayMapper.xml
New file @@ -0,0 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.stylefeng.guns.modular.system.dao.TSysDistanceDisplayMapper"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSysDistanceDisplay"> <id column="id" property="id" /> <result column="companyId" property="companyId" /> <result column="passengerLocationDistance" property="passengerLocationDistance" /> <result column="insertTime" property="insertTime" /> <result column="updateTime" property="updateTime" /> </resultMap> <sql id="Base_Column_List"> id, companyId, passengerLocationDistance, insertTime, updateTime </sql> </mapper> ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysDistanceDisplay.java
New file @@ -0,0 +1,99 @@ package com.stylefeng.guns.modular.system.model; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; /** * <p> * 系统设置-距离展示 * </p> */ @TableName("t_sys_distance_display") public class TSysDistanceDisplay extends Model<TSysDistanceDisplay> { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Integer id; /** * 企业id */ @TableField("companyId") private Integer companyId; /** * 乘客定位超过上车点距离(公里) */ @TableField("passengerLocationDistance") private BigDecimal passengerLocationDistance; @TableField("insertTime") private Date insertTime; @TableField("updateTime") private Date updateTime; public Integer getId() { return id; } public void setId(Integer id) { this.id = id; } public Integer getCompanyId() { return companyId; } public void setCompanyId(Integer companyId) { this.companyId = companyId; } public BigDecimal getPassengerLocationDistance() { return passengerLocationDistance; } public void setPassengerLocationDistance(BigDecimal passengerLocationDistance) { this.passengerLocationDistance = passengerLocationDistance; } public Date getInsertTime() { return insertTime; } public void setInsertTime(Date insertTime) { this.insertTime = insertTime; } public Date getUpdateTime() { return updateTime; } public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } @Override protected Serializable pkVal() { return this.id; } @Override public String toString() { return "TSysDistanceDisplay{" + "id=" + id + ", companyId=" + companyId + ", passengerLocationDistance=" + passengerLocationDistance + ", insertTime=" + insertTime + ", updateTime=" + updateTime + "}"; } } ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysDistanceDisplayService.java
New file @@ -0,0 +1,13 @@ package com.stylefeng.guns.modular.system.service; import com.baomidou.mybatisplus.service.IService; import com.stylefeng.guns.modular.system.model.TSysDistanceDisplay; /** * <p> * 系统设置-距离展示 服务类 * </p> */ public interface ITSysDistanceDisplayService extends IService<TSysDistanceDisplay> { } ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysDistanceDisplayServiceImpl.java
New file @@ -0,0 +1,17 @@ package com.stylefeng.guns.modular.system.service.impl; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.stylefeng.guns.modular.system.dao.TSysDistanceDisplayMapper; import com.stylefeng.guns.modular.system.model.TSysDistanceDisplay; import com.stylefeng.guns.modular.system.service.ITSysDistanceDisplayService; import org.springframework.stereotype.Service; /** * <p> * 系统设置-距离展示 服务实现类 * </p> */ @Service public class TSysDistanceDisplayServiceImpl extends ServiceImpl<TSysDistanceDisplayMapper, TSysDistanceDisplay> implements ITSysDistanceDisplayService { } ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -56,6 +56,7 @@ <label class="lab" onclick="checkedLable(this)" tag="holidayServiceFeeSetting">节假日服务费设置</label> <label class="lab" onclick="checkedLable(this)" tag="95128TheOnCall">95128电召</label> <label class="lab" onclick="checkedLable(this)" tag="moduleManagement">模块管理</label> <label class="lab" onclick="checkedLable(this)" tag="distanceDisplaySettings">距离展示设置</label> </div> <div style="float: left;width: 1200px;margin-left: 50px;"> <div class="pushOrderSettings"> @@ -623,6 +624,28 @@ </div> </div> </div> <div class="distanceDisplaySettings" hidden> <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(distanceDisplay)){ value="${distanceDisplay.passengerLocationDistance}" @}else{ value="" @} name="passengerLocationDistance" id="passengerLocationDistance" class="form-control newWidth" /> 公里，不在司机端页面展示乘客定位 </div> </div> <br/> <div class="row btn-group-m-t"> <div class="col-sm-10 col-sm-offset-5"> <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('distanceDisplaySettings')"/> </div> </div> </div> <div class="moduleManagement" hidden> <table> <thead> @@ -873,6 +896,18 @@ } } var passengerLocationDistance = $("#passengerLocationDistance").val().trim(); if(type == "distanceDisplaySettings"){ if('' == passengerLocationDistance){ Feng.info("输入框不能为空!"); return; } if(!regDouble.test(passengerLocationDistance)){ Feng.info("格式不正确!"); return ; } } var holidayFee = $("#holidayFee").val().trim(); @@ -1021,6 +1056,9 @@ if(type == "95128TheOnCall"){ ajax.set("phone4", phone4); } if(type == "distanceDisplaySettings"){ ajax.set("passengerLocationDistance", passengerLocationDistance); } if(type == 'holidayServiceFeeSetting'){ ajax.set("holidayFee", holidayFee); }
