From 30d6ddaa04fd7b66e2041f1856e182b7c6a94918 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 08 十二月 2023 15:09:07 +0800 Subject: [PATCH] 更新接口 --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java index 33a347e..a0863a9 100644 --- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java +++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java @@ -11,9 +11,7 @@ import com.stylefeng.guns.core.util.DateUtil; import com.stylefeng.guns.core.util.SinataUtil; import com.stylefeng.guns.modular.system.model.*; -import com.stylefeng.guns.modular.system.service.ITCompanyCityService; -import com.stylefeng.guns.modular.system.service.ITRegionService; -import com.stylefeng.guns.modular.system.service.IUserService; +import com.stylefeng.guns.modular.system.service.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -23,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import com.stylefeng.guns.core.log.LogObjectHolder; import org.springframework.web.bind.annotation.RequestParam; -import com.stylefeng.guns.modular.system.service.ITCompanyService; import java.util.ArrayList; import java.util.Date; @@ -54,8 +51,8 @@ @Autowired private ITCompanyCityService tCompanyCityService; - @Value("${pushMinistryOfTransport}") - private boolean pushMinistryOfTransport; + @Autowired + private ICityService cityService; /** * 跳转到修改平台信息 @@ -67,8 +64,9 @@ LogObjectHolder.me().set(tCompany); //省 - List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0)); - model.addAttribute("provinceList",provinceList); + List<City> cities = cityService.selectList(null); +// List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0)); + model.addAttribute("city",cities); //系统用户对象 User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 1).eq("objectId", tCompany.getId())); @@ -101,8 +99,8 @@ */ @RequestMapping("/tCompany_add") public String tCompanyAdd(Model model) { - List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0)); - model.addAttribute("provinceList",provinceList); + List<City> cities = cityService.selectList(null); + model.addAttribute("city",cities); return PREFIX + "tCompany_add.html"; } @@ -134,8 +132,8 @@ LogObjectHolder.me().set(tCompany); //省 - List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0)); - model.addAttribute("provinceList",provinceList); + List<City> cities = cityService.selectList(null); + model.addAttribute("city",cities); //系统用户对象 User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId)); @@ -158,8 +156,8 @@ LogObjectHolder.me().set(tCompany); //省 - List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0)); - model.addAttribute("provinceList",provinceList); + List<City> cities = cityService.selectList(null); + model.addAttribute("city",cities); //系统用户对象 User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId)); @@ -332,9 +330,7 @@ TCompanyCity tCompanyCity = tCompanyCityService.selectOne(new EntityWrapper<TCompanyCity>().eq("id", jsonObject.getInteger("recordId")).eq("companyId", id)); if (SinataUtil.isEmpty(tCompanyCity)){ tCompanyCity = new TCompanyCity(); - tCompanyCity.setProvinceCode(jsonObject.getInteger("provinceCode")); - tCompanyCity.setCityCode(jsonObject.getInteger("cityCode")); - tCompanyCity.setAreaCode(jsonObject.getInteger("areaCode")); + tCompanyCity.setCityId(jsonObject.getInteger("cityId")); tCompanyCity.setCompanyId(id); tCompanyCity.setState(1); tCompanyCityService.insert(tCompanyCity); -- Gitblit v1.7.1