management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
@@ -29,6 +29,7 @@ import com.stylefeng.guns.core.log.LogObjectHolder; import org.springframework.web.bind.annotation.RequestParam; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -135,15 +136,15 @@ String[] split1 = areaId.split("/"); List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0)); model.addAttribute("provinceList",tRegions); List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList()); // 查询市 List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0])); model.addAttribute("cityList",tRegions1); // 查询区 List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList()); List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds)); model.addAttribute("districtList",tRegions2); // List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList()); // // 查询市 // List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0])); // model.addAttribute("cityList",tRegions1); // // // 查询区 // List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList()); // List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds)); // model.addAttribute("districtList",tRegions2); if(StringUtils.hasLength(area) && StringUtils.hasLength(areaId)){ String[] split = area.split("/"); @@ -162,13 +163,23 @@ }else { model.addAttribute("districtId", ""); } List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0])); model.addAttribute("cityList",tRegions1); // 查询区 List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1])); model.addAttribute("districtList",tRegions2); }else { model.addAttribute("cityList",new ArrayList<>()); model.addAttribute("districtList",new ArrayList<>()); model.addAttribute("provinceName",""); model.addAttribute("cityName","split[1]"); model.addAttribute("cityName",""); model.addAttribute("districtName",""); model.addAttribute("provinceId",""); model.addAttribute("cityId","split1[1]"); model.addAttribute("cityId",""); model.addAttribute("districtId", ""); } return PREFIX + "tBranchOfficeAreaAdd.html"; @@ -208,7 +219,7 @@ // 查询区 List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList()); List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds)); List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1])); model.addAttribute("districtList",tRegions2); return PREFIX + "tBranchOfficeAreaUpdate.html"; management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -253,7 +253,7 @@ // 查询区 List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList()); List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds)); List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1])); model.addAttribute("districtList",tRegions2); return PREFIX + "tDriverAreaUpdate.html"; @@ -267,15 +267,15 @@ String[] split1 = areaId.split("/"); List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0)); model.addAttribute("provinceList",tRegions); List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList()); // 查询市 List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0])); model.addAttribute("cityList",tRegions1); // 查询区 List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList()); List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds)); model.addAttribute("districtList",tRegions2); // List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList()); // // 查询市 // List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0])); // model.addAttribute("cityList",tRegions1); // // // 查询区 // List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList()); // List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds)); // model.addAttribute("districtList",tRegions2); if(StringUtils.hasLength(area) && StringUtils.hasLength(areaId)){ String[] split = area.split("/"); @@ -294,7 +294,17 @@ }else { model.addAttribute("districtId", ""); } List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0])); model.addAttribute("cityList",tRegions1); // 查询区 List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1])); model.addAttribute("districtList",tRegions2); }else { model.addAttribute("cityList",new ArrayList<>()); model.addAttribute("districtList",new ArrayList<>()); model.addAttribute("provinceName",""); model.addAttribute("cityName","split[1]"); model.addAttribute("districtName",""); management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
@@ -227,8 +227,8 @@ tBranchOffice.setDistrictName(area.getName()); tBranchOffice.setDistrictCode(area.getCode()); }else { tBranchOffice.setDistrictName(""); tBranchOffice.setDistrictCode(""); tBranchOffice.setDistrictName(city.getName()); tBranchOffice.setDistrictCode(city.getCode()); } // 通过省市查询代理商 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -335,12 +335,24 @@ tDriver.setCityName(city.getName()); tDriver.setCityCode(city.getCode()); TRegion area = tRegionMapper.selectById(split[2]); // TRegion area = tRegionMapper.selectById(split[2]); // if(Objects.isNull(area)){ // area = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[2])); // } // tDriver.setAreaName(area.getName()); // tDriver.setAreaCode(area.getCode()); TRegion area = null; if(split.length>2){ area = itRegionService.selectById(split[2]); if(Objects.isNull(area)){ area = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[2])); } tDriver.setAreaName(area.getName()); tDriver.setAreaCode(area.getCode()); }else { tDriver.setAreaName(city.getName()); tDriver.setAreaCode(city.getCode()); } // 通过省市查询代理商 List<TAgent> tAgent = tAgentMapper.selectList(new EntityWrapper<TAgent>().eq("provinceCode", province.getCode()) @@ -363,12 +375,22 @@ return new SuccessTip(500, "该邀约人:"+tDriver.getInviterName()+"不存在"); } } List<TBranchOffice> tBranchOffice; if(split.length>2){ // 通过省市区查询分公司 List<TBranchOffice> tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode()) tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode()) .eq("cityCode", city.getCode()) .eq("status", StatusEnum.NORMAL.getCode()) .eq("districtCode", area.getCode()) .last("LIMIT 1")); }else { // 通过省市区查询分公司 tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode()) .eq("cityCode", city.getCode()) .eq("status", StatusEnum.NORMAL.getCode()) .eq("districtCode", city.getCode()) .last("LIMIT 1")); } if(!CollectionUtils.isEmpty(tBranchOffice)){ tDriver.setBranchOfficeId(tBranchOffice.get(0).getId()); }else { management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaAdd.html
@@ -11,7 +11,7 @@ <select class="input-group col-sm-2 " onclick="TBranchOffice.areaCity()" id="province" style="width: 200px;height: 33px" name="province"> <option value="">请选择</option> @for(i in provinceList){ <option id="${i.id}" value="${i.name}"${i.name == provinceName ? 'selected=selected' : ''}>${i.name}</option> <option id="${i.id}" value="${i.id}"${i.name == provinceName ? 'selected=selected' : ''}>${i.name}</option> @} </select> </div> @@ -20,7 +20,7 @@ <select class="input-group col-sm-2" onclick="TBranchOffice.areaDistrict()" id="city" style="width: 200px;height: 33px" name="city"> <option value="">请选择</option> @for(city in cityList){ <option id="${city.id}" value="${city.name}"${city.name == cityName ? 'selected=selected' : ''}>${city.name}</option> <option id="${city.id}" value="${city.id}"${city.name == cityName ? 'selected=selected' : ''}>${city.name}</option> @} </select> </div> @@ -29,7 +29,7 @@ <select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district"> <option value="">请选择</option> @for(district in districtList){ <option id="${district.id}" value="${district.name}"${district.name == districtName ? 'selected=selected' : ''}>${district.name}</option> <option id="${district.id}" value="${district.id}"${district.name == districtName ? 'selected=selected' : ''}>${district.name}</option> @} </select> </div> management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaUpdate.html
@@ -17,7 +17,7 @@ <select class="input-group col-sm-2 " onclick="TBranchOffice.areaCity()" id="province" style="width: 200px;height: 33px" name="province"> <option value="">请选择</option> @for(i in provinceList){ <option id="${i.id}" value="${i.name}"${i.name == provinceName ? 'selected=selected' : ''}>${i.name}</option> <option id="${i.id}" value="${i.id}"${i.name == provinceName ? 'selected=selected' : ''}>${i.name}</option> @} </select> </div> @@ -26,7 +26,7 @@ <select class="input-group col-sm-2" onclick="TBranchOffice.areaDistrict()" id="city" style="width: 200px;height: 33px" name="city"> <option>请选择</option> @for(city in cityList){ <option id="${city.id}" value="${city.name}"${city.name == cityName ? 'selected=selected' : ''}>${city.name}</option> <option id="${city.id}" value="${city.id}"${city.name == cityName ? 'selected=selected' : ''}>${city.name}</option> @} </select> </div> @@ -35,7 +35,7 @@ <select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district"> <option>请选择</option> @for(district in districtList){ <option id="${district.id}" value="${district.name}"${district.name == districtName ? 'selected=selected' : ''}>${district.name}</option> <option id="${district.id}" value="${district.id}"${district.name == districtName ? 'selected=selected' : ''}>${district.name}</option> @} </select> </div> management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_add.html
@@ -8,7 +8,7 @@ <div class="ibox-content" id="branchOfficeInfoForm"> <div class="row row-lg"> <div class="col-sm-12"> <input hidden id="areaId" value="areaId"> <input hidden id="areaId" value=""> <div class="col-sm-12" style="cursor: pointer;text-align: right;"> <div class="initialLevel col-sm-12 control-label form-group" > management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaAdd.html
@@ -11,7 +11,7 @@ <select class="input-group col-sm-2 " onclick="TDriver.areaCity()" id="province" style="width: 200px;height: 33px" name="province"> <option value="">请选择</option> @for(i in provinceList){ <option id="${i.id}" value="${i.name}"${i.name == provinceName ? 'selected=selected' : ''}>${i.name}</option> <option id="${i.id}" value="${i.id}"${i.name == provinceName ? 'selected=selected' : ''}>${i.name}</option> @} </select> </div> @@ -20,7 +20,7 @@ <select class="input-group col-sm-2" onclick="TDriver.areaDistrict()" id="city" style="width: 200px;height: 33px" name="city"> <option>请选择</option> @for(city in cityList){ <option id="${city.id}" value="${city.name}"${city.name == cityName ? 'selected=selected' : ''}>${city.name}</option> <option id="${city.id}" value="${city.id}"${city.name == cityName ? 'selected=selected' : ''}>${city.name}</option> @} </select> </div> @@ -29,7 +29,7 @@ <select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district"> <option>请选择</option> @for(district in districtList){ <option id="${district.id}" value="${district.name}"${district.name == districtName ? 'selected=selected' : ''}>${district.name}</option> <option id="${district.id}" value="${district.id}"${district.name == districtName ? 'selected=selected' : ''}>${district.name}</option> @} </select> </div> management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaUpdate.html
@@ -17,7 +17,7 @@ <select class="input-group col-sm-2 " onclick="TDriver.areaCity()" id="province" style="width: 200px;height: 33px" name="province"> <option value="">请选择</option> @for(i in provinceList){ <option id="${i.id}" value="${i.name}"${i.name == provinceName ? 'selected=selected' : ''}>${i.name}</option> <option id="${i.id}" value="${i.id}"${i.name == provinceName ? 'selected=selected' : ''}>${i.name}</option> @} </select> </div> @@ -26,7 +26,7 @@ <select class="input-group col-sm-2" onclick="TDriver.areaDistrict()" id="city" style="width: 200px;height: 33px" name="city"> <option>请选择</option> @for(city in cityList){ <option id="${city.id}" value="${city.name}"${city.name == cityName ? 'selected=selected' : ''}>${city.name}</option> <option id="${city.id}" value="${city.id}"${city.name == cityName ? 'selected=selected' : ''}>${city.name}</option> @} </select> </div> @@ -35,7 +35,7 @@ <select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district"> <option>请选择</option> @for(district in districtList){ <option id="${district.id}" value="${district.name}"${district.name == districtName ? 'selected=selected' : ''}>${district.name}</option> <option id="${district.id}" value="${district.id}"${district.name == districtName ? 'selected=selected' : ''}>${district.name}</option> @} </select> </div> management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js
@@ -340,8 +340,10 @@ TBranchOffice.submitArea = function () { var province = document.getElementById('province'); var provinceIndex= province.selectedIndex ; var provinceName = province.options[provinceIndex].value; var provinceId = province.options[provinceIndex].id; var provinceId = province.options[provinceIndex].value; var provinceName = province.options[provinceIndex].innerText; console.log(provinceId) console.log(provinceName) if(provinceName == null || provinceName == ''){ Feng.error("请选择省份!") @@ -352,7 +354,8 @@ var cityIndex= city.selectedIndex ; var cityId = city.options[cityIndex].value; var cityName = city.options[cityIndex].innerText; console.log(cityId) console.log(cityName) if(cityName == null || cityName == '' || cityName =='请选择'){ Feng.error("请选择市区!") return; @@ -362,6 +365,8 @@ var districtIndex= district.selectedIndex ; var districtId = district.options[districtIndex].value; var districtName = district.options[districtIndex].innerText; console.log(districtId) console.log(districtName) if(districtName == '' || districtName == null || districtName == '请选择'){ parent.$("#area").val(provinceName+'/'+cityName) @@ -370,6 +375,8 @@ parent.$("#area").val(provinceName+'/'+cityName+'/'+districtName) parent.$("#areaId").val(provinceId+'/'+cityId+'/'+districtId) } console.log($("#area").val()) console.log($("#areaId").val()) TBranchOfficeInfoDlg.close(); }
@@ -472,9 +472,10 @@ TDriver.submitArea = function () { var province = document.getElementById('province'); var provinceIndex= province.selectedIndex ; var provinceName = province.options[provinceIndex].value; var provinceId = province.options[provinceIndex].id; var provinceId = province.options[provinceIndex].value; var provinceName = province.options[provinceIndex].innerText; console.log(provinceId) console.log(provinceName) if(provinceName == null || provinceName == ''){ Feng.error("请选择省份!") return; @@ -484,7 +485,8 @@ var cityIndex= city.selectedIndex ; var cityId = city.options[cityIndex].value; var cityName = city.options[cityIndex].innerText; console.log(cityId) console.log(cityName) if(cityName == null || cityName == '' || cityName =='请选择'){ Feng.error("请选择市区!") return; @@ -494,14 +496,15 @@ var districtIndex= district.selectedIndex ; var districtId = district.options[districtIndex].value; var districtName = district.options[districtIndex].innerText; if(districtName == null || districtName == '' || districtName =='请选择'){ Feng.error("请选择区县!") return; } console.log(districtId) console.log(districtName) if(districtName == '' || districtName == null || districtName == '请选择'){ parent.$("#area").val(provinceName+'/'+cityName) parent.$("#areaId").val(provinceId+'/'+cityId) }else { parent.$("#area").val(provinceName+'/'+cityName+'/'+districtName) parent.$("#areaId").val(provinceId+'/'+cityId+'/'+districtId) } TDriverInfoDlg.close(); }
