ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -285,6 +285,8 @@ model.addAttribute("companyType",2); } model.addAttribute("companyData",tCompanyService.selectById(tDriver.getCompanyId())); //获取经营业务 List<TDriverService> serviceList = tDriverServiceService.selectList(new EntityWrapper<TDriverService>().eq("driverId", tDriverId)); Integer one = 1; @@ -617,6 +619,60 @@ } /** * 用于获取公司的经营业务【202601】 * * @param oneId * @return */ @RequestMapping(value = "/twoChange") @ResponseBody public Object twoChange(@RequestParam Integer oneId) { List<TCompany> list = new ArrayList<>(); if (SinataUtil.isNotEmpty(oneId)){ list = tCompanyService.selectList(new EntityWrapper<TCompany>() .eq("type", 3) .eq("superiorId", oneId) .notIn("flag",3) .notIn("state",1)); } HashMap<String, Object> map = new HashMap<>(); map.put("list", list); TCompany company = tCompanyService.selectById(oneId); map.put("company", company); return map; } @RequestMapping(value = "/listLine") @ResponseBody public Object listLine(String oneId) { Integer objectId = shiroExtUtil.getUser().getObjectId(); if(objectId==1){ if(oneId==null || oneId.equals("") || oneId.equals("1")){ List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1)); return lineList; }else { List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1).last(" and (id in (select lineId from t_line_company where companyId = " + oneId + ") or companyId = " + oneId + ")")); return lineList; } }else { TCompany company = tCompanyService.selectById(objectId); oneId = company.getId().toString(); if(shiroExtUtil.getUser().getRoleType()==3){ TCompany company1 = tCompanyService.selectById(company.getSuperiorId()); oneId = company1.getId().toString(); } List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1).last(" and (id in (select lineId from t_line_company where companyId = " + oneId + ") or companyId = " + oneId + ")")); return lineList; } } /** * 获取司机审核列表列表 */ @RequestMapping(value = "/list") ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
@@ -212,6 +212,7 @@ DATE_FORMAT(ot.travelTime,'%Y-%m-%d %H:%i') as travelTimeStr, DATE_FORMAT(ot.boardingTime,'%Y-%m-%d %H:%i') as boardingTimeStr, DATE_FORMAT(ot.getoffTime,'%Y-%m-%d %H:%i') as getoffTimeStr, DATE_FORMAT(ot.payTime,'%Y-%m-%d %H:%i') as payTimeStr, case when ot.orderSource = 1 then 'APP下单' when ot.orderSource = 2 then '扫码下单' when ot.orderSource = 3 then '小程序下单' ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -222,6 +222,7 @@ DATE_FORMAT(ot.travelTime,'%Y-%m-%d %H:%i') as travelTimeStr, DATE_FORMAT(ot.boardingTime,'%Y-%m-%d %H:%i') as boardingTimeStr, DATE_FORMAT(ot.getoffTime,'%Y-%m-%d %H:%i') as getoffTimeStr, DATE_FORMAT(ot.payTime,'%Y-%m-%d %H:%i') as payTimeStr, case when ot.orderSource = 1 then 'APP下单' when ot.orderSource = 2 then '扫码下单' when ot.orderSource = 3 then '小程序下单' ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -33,7 +33,7 @@ max-request-size: 500MB max-file-size: 500MB redis: host: 127.0.0.1 host: 192.168.110.80 port: 6379 password: 123456 session: @@ -54,7 +54,7 @@ --- spring: datasource: url: jdbc:mysql://127.0.0.1:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.110.85:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 123456 db-name: qyttravel #用来搜集数据库的所有表 @@ -65,7 +65,7 @@ spring: data: mongodb: uri: mongodb://127.0.0.1:27017/traveling_track uri: mongodb://192.168.110.80:27017/traveling_track --- @@ -91,13 +91,13 @@ --- qyt: chuxing_url: http://127.0.0.1:8010 daijia_url: http://127.0.0.1:8010 chuxing_url: http://192.168.110.80:8010 daijia_url: http://192.168.110.80:8010 #支付回调地址 #正式环境 callbackPath: http://127.0.0.1 callbackPath: http://192.168.110.80 #交通部推送数据功能开关 pushMinistryOfTransport: false ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -95,15 +95,15 @@ <fieldset> <label class="col-sm-3 control-label">经营业务：</label> <div class="col-sm-9"> <div class="checkbox checkbox-success checkbox-inline"> <div class="checkbox checkbox-success checkbox-inline" id="check1"> <input id="serverBox1" name="serverBox" type="checkbox" value="1"> <label for="serverBox1"> 快车 </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <div class="checkbox checkbox-success checkbox-inline" id="check2"> <input type="checkbox" name="serverBox" id="serverBox2" value="2"> <label for="serverBox2"> 出租车 </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <div class="checkbox checkbox-success checkbox-inline" id="check3"> <input id="serverBox3" name="serverBox" onclick="YesDriverInfoDlg.checkBox()" type="checkbox" value="3"> <label for="serverBox3"> 跨城出行 </label> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -4,6 +4,9 @@ <div class="form-horizontal" id="yesDriverInfoForm"> <input type="hidden" id="id" name="id" value="${item.id}"> <input type="hidden" id="roleType" name="roleType" value="${roleType}"> <input type="hidden" id="check1_" name="roleType" value="${companyData.isSpe}"> <input type="hidden" id="check2_" name="roleType" value="${companyData.isTaxi}"> <input type="hidden" id="check3_" name="roleType" value="${companyData.isCross}"> <div class="row"> <div class="col-sm-11"> <#input id="name" name="司机姓名" value="${item.name}"/> @@ -103,15 +106,15 @@ <fieldset> <label class="col-sm-3 control-label">经营业务：</label> <div class="col-sm-9"> <div class="checkbox checkbox-success checkbox-inline"> <div class="checkbox checkbox-success checkbox-inline" id="check1"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''}> <label for="serverBox1"> 快车 </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <div class="checkbox checkbox-success checkbox-inline" id="check2"> <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}> <label for="serverBox2"> 出租车 </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <div class="checkbox checkbox-success checkbox-inline" id="check3"> <input type="checkbox" name="serverBox" id="serverBox3" value="3" ${2 == three ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.checkBox()" > <label for="serverBox3"> 跨城出行 </label> </div> @@ -308,6 +311,31 @@ } else if (2 == companyType){ $(".companyDiv").show(); } console.log($('#check2_').val(),2323) if($('#check1_').val()==1){ $("#check1").show() }else { $("#check1").hide() console.log(222) $("#serverBox1").val('') } if($('#check2_').val()==1){ $("#check2").show() }else { $("#check2").hide() $("#serverBox2").val('') } if($('#check3_').val()==1){ $("#check3").show() }else { $("#check3").hide() $("#serverBox3").val('') } YesDriverInfoDlg.listLine() }); </script> @} ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html
@@ -47,6 +47,7 @@ <#label id="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/> <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/> <#label id="lineName" name="线路" value="${item.lineName}"/> <#label id="payTime" name="付款时间" value="${item.payTimeStr}"/> </div> </div>
@@ -131,6 +131,11 @@ <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/> </div> </div> <div class="row"> <div class="col-sm-6"> <#label id="payTime" name="付款时间" value="${item.payTimeStr}"/> </div> </div> <div class="row" style="margin-top: 30px;"> <div class="col-sm-4"> <h2 class="h3Class" style="font-weight: 700;">费用明细</h2> ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
@@ -437,7 +437,9 @@ // } var serverBox =[]; $('input[name="serverBox"]:checked').each(function(){ serverBox.push($(this).val()); if($(this).val()!=null && $(this).val()!='') { serverBox.push($(this).val()); } }); if (serverBox.length == 0){ Feng.info("请选择经营业务!"); @@ -553,12 +555,17 @@ // } var serverBox =[]; $('input[name="serverBox"]:checked').each(function(){ serverBox.push($(this).val()); if($(this).val()!=null && $(this).val()!=''){ serverBox.push($(this).val()); } }); if (serverBox.length == 0){ Feng.info("请选择经营业务!"); return; } var serverBox3 = $('#serverBox3').prop('checked'); var subArr=[]; if (serverBox3){ @@ -653,6 +660,26 @@ ajax.start(); } YesDriverInfoDlg.listLine = function () { var oneId = $("#oneId").val(); console.log(4444) var ajax = new $ax(Feng.ctxPath + "/tDriver/listLine", function(data){ $("#selectLineId").val(''); if(data!=null){ var content=''; $.each(data, function(k,v) { content += "<option value='"+v.id+"' tag='" + v.code + "'>"+v.name+"</option>"; }); $("#selectLineId").empty().append(content); } }); ajax.set("oneId",oneId); ajax.start(); } $(function() { Feng.initValidator("yesDriverInfoForm", YesDriverInfoDlg.validateFields); @@ -681,7 +708,21 @@ * 添加线路操作 */ YesDriverInfoDlg.addLine = function () { var companyType = $("input[name='companyType']:checked").val(); var oneId = $("#oneId").val() if (1 != companyType && (oneId==null || oneId == '')){ Feng.info("请选择所属公司在添加线路"); return; } var selectLineName = $("#selectLineId option:selected").text(); if ("" == selectLineName || null == selectLineName){ Feng.info("请选择关联线路"); return; } var selectLineId = $("#selectLineId").val(); if ("" == selectLineId){ Feng.info("选择关联线路"); @@ -749,13 +790,41 @@ */ YesDriverInfoDlg.oneChange = function (e) { var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tDriver/oneChange", function(data){ if(data!=null){ var ajax = new $ax(Feng.ctxPath + "/tDriver/twoChange", function(data1){ if(data1!=null){ var data=data1.list; var content='<option value="">选择所属加盟商</option>'; $.each(data, function(k,v) { content += "<option value='"+v.id+"'>"+v.name+"</option>"; }); $("#twoId").empty().append(content); var company = data1.company console.log( company,23232) if(company.isSpe==1){ $("#check1").show() }else { $("#check1").hide() $("#serverBox1").val("") console.log(222) } if(company.isTaxi==1){ $("#check2").show() }else { $("#check2").hide() $("#serverBox2").val("") } if(company.isCross==1){ $("#check3").show() }else { $("#check3").hide() $("#serverBox3").val("") } YesDriverInfoDlg.listLine() } }); ajax.set("oneId",oneId); @@ -797,8 +866,50 @@ console.log(e) if (1 == e){ $(".companyDiv").hide(); $("#check1").show() $("#check2").show() $("#check3").show() } else if (2 == e){ $(".companyDiv").show(); if($("#oneId").val() !=null && $("#oneId").val() !=''){ var oneId=$("#oneId").val(); var ajax = new $ax(Feng.ctxPath + "/tDriver/twoChange", function(data1){ if(data1!=null){ var company = data1.company console.log( company,23232) if(company.isSpe==1){ $("#check1").show() }else { $("#check1").hide() $("#serverBox1").val("") } if(company.isTaxi==1){ $("#check2").show() }else { $("#check2").hide() $("#serverBox2").val("") } if(company.isCross==1){ $("#check3").show() }else { $("#check3").hide() $("#serverBox3").val("") } } YesDriverInfoDlg.listLine() }); ajax.set("oneId",oneId); ajax.start(); } } }
