ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -218,12 +218,25 @@ public String tDriver_immediately(@PathVariable Integer tDriverId, Model model) { Map<String, Object> tDriver = tDriverService.getDriverById(tDriverId); model.addAttribute("item",tDriver); if(tDriver.get("placeOfPractice")!=null){ String placeOfPractice = tDriver.get("placeOfPractice").toString().replaceAll(",", "-"); model.addAttribute("placeOfPractice", placeOfPractice); }else { model.addAttribute("placeOfPractice", ""); //处理从业地字段 String placeOfPracticeStr = ""; if(tDriver.get("placeOfEmployment") != null){ String placeOfEmployment = tDriver.get("placeOfEmployment").toString(); //根据地区代码查询省市区名称 TRegion area = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", placeOfEmployment)); if(area != null) { TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", area.getParentId())); if(city != null) { TRegion province = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", city.getParentId())); if(province != null) { placeOfPracticeStr = province.getName() + "-" + city.getName() + "-" + area.getName(); } } } } model.addAttribute("placeOfPractice", placeOfPracticeStr); LogObjectHolder.me().set(tDriver); return PREFIX + "tDriver_immediately.html"; } @@ -254,12 +267,25 @@ public String tDriver_look(@PathVariable Integer tDriverId, Model model) { Map<String, Object> tDriver = tDriverService.getDriverById(tDriverId); model.addAttribute("item",tDriver); Object placeOfPractice1 = tDriver.get("placeOfPractice"); if(placeOfPractice1==null){ model.addAttribute("placeOfPractice", ""); }else { model.addAttribute("placeOfPractice", placeOfPractice1.toString().replaceAll(",", "-")); //处理从业地字段 String placeOfPracticeStr = ""; if(tDriver.get("placeOfEmployment") != null){ String placeOfEmployment = tDriver.get("placeOfEmployment").toString(); //根据地区代码查询省市区名称 TRegion area = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", placeOfEmployment)); if(area != null) { TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", area.getParentId())); if(city != null) { TRegion province = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", city.getParentId())); if(province != null) { placeOfPracticeStr = province.getName() + "-" + city.getName() + "-" + area.getName(); } } } } model.addAttribute("placeOfPractice", placeOfPracticeStr); LogObjectHolder.me().set(tDriver); return PREFIX + "tDriver_look.html"; } ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
@@ -120,11 +120,9 @@ Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId); TOrderPrivateCar tOrderPrivateCar1 = tOrderPrivateCarService.selectById(tOrderPrivateCarId); Object o1 = item.get("abnormalImg"); if(o1!=null){ if(o1!=null && !o1.toString().equals("")){ String[] split = o1.toString().split(","); model.addAttribute("abnormalImg",split); }else { model.addAttribute("abnormalImg",new String[]{}); } // money是修改后的金额 model.addAttribute("money",""); @@ -151,11 +149,9 @@ Map<String, Object> item = tOrderCrossCityService.getCrossCityOrderDetailById(tOrderPrivateCarId); TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectById(tOrderPrivateCarId); Object o1 = item.get("abnormalImg"); if(o1!=null){ if(o1!=null && !o1.toString().equals("")){ String[] split = o1.toString().split(","); model.addAttribute("abnormalImg",split); }else { model.addAttribute("abnormalImg",new String[]{}); } Object o2 = item.get("responsibilityType"); model.addAttribute("money",""); @@ -171,11 +167,9 @@ Map<String, Object> item = tOrderTaxiService.getTaxiOrderDetailById(tOrderPrivateCarId); TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(tOrderPrivateCarId); Object o1 = item.get("abnormalImg"); if(o1!=null){ if(o1!=null && !o1.toString().equals("")){ String[] split = o1.toString().split(","); model.addAttribute("abnormalImg",split); }else { model.addAttribute("abnormalImg",new String[]{}); } model.addAttribute("money",""); model.addAttribute("show",0); @@ -226,11 +220,9 @@ }else if(type==2){ Map<String, Object> item = tOrderCrossCityService.getCrossCityOrderDetailById(tOrderPrivateCarId); Object o1 = item.get("abnormalImg"); if(o1!=null){ if(o1!=null && !o1.toString().equals("")){ String[] split = o1.toString().split(","); model.addAttribute("abnormalImg",split); }else { model.addAttribute("abnormalImg",new String[]{}); } Object o2 = item.get("responsibilityType"); model.addAttribute("money",0); @@ -246,11 +238,9 @@ }else if(type==3){ Map<String, Object> item = tOrderTaxiService.getTaxiOrderDetailById(tOrderPrivateCarId); Object o1 = item.get("abnormalImg"); if(o1!=null){ if(o1!=null && !o1.toString().equals("")){ String[] split = o1.toString().split(","); model.addAttribute("abnormalImg",split); }else { model.addAttribute("abnormalImg",new String[]{}); } model.addAttribute("money",0); model.addAttribute("show",1); ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -21,7 +21,7 @@ <label class="col-sm-3 control-label">经营业务：</label> <div class="col-sm-9"> <fieldset> @if(roleType == 1 || (roleType == 2 && company.isSpe == 1)){ @if(roleType == 1 || (roleType != 1 && item.isSpe == 1)){ <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()"> <label for="checkbox1"> @@ -35,7 +35,7 @@ </fieldset> </div> @} @if(roleType == 1 || (roleType == 2 && company.isTaxi == 1)){ @if(roleType == 1 || (roleType != 1 && item.isTaxi == 1)){ <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()"> <label for="checkbox2"> @@ -50,7 +50,7 @@ </fieldset> </div> @} @if(roleType == 1 || (roleType == 2 && company.isCross == 1)){ @if(roleType == 1 || (roleType != 1 && item.isCross == 1)){ <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()"> <label for="checkbox3"> @@ -98,7 +98,7 @@ <!-- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set2('OnCall')"/>--> <!-- <textarea id="OnCall" rows="5" cols="50" hidden="hidden" value="${item.OnCall}" >${item.OnCall}</textarea>--> <!-- </div>--> @if(roleType == 1 || (roleType == 2 && company.isHitchRide == 1)){ @if(roleType == 1 || (roleType != 1 && item.isHitchRide == 1)){ <div class="checkbox checkbox-success"> <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()" type="checkbox" value="8" ${1 == item.isHitchRide ? 'checked=checked' : ''}> @@ -107,7 +107,7 @@ </label> </div> @} @if(roleType == 1 || (roleType == 2 && company.isSubstituteDriving == 1)){ @if(roleType == 1 || (roleType != 1 && item.isSubstituteDriving == 1)){ <div class="checkbox checkbox-success"> <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()" type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''}>
