From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 63 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 34 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..2f44503 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
@@ -7,23 +7,18 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
-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 org.springframework.beans.factory.annotation.Value;
+import com.stylefeng.guns.modular.system.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
import java.util.Date;
@@ -54,8 +49,8 @@
@Autowired
private ITCompanyCityService tCompanyCityService;
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
+ @Autowired
+ private ICityService cityService;
/**
* 跳转到修改平台信息
@@ -67,8 +62,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 +97,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 +130,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 +154,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));
@@ -301,6 +297,7 @@
}
tCompany.setType(2); //2：分公司
tCompany.setState(0); //0：正常
+ tCompany.setSuperiorId(1);
tCompany.setInsertTime(new Date());
tCompanyService.insert(tCompany);
@@ -325,20 +322,20 @@
}
//添加经营区域
public void addSocpe(String subArr,Integer id){
+ tCompanyCityService.delete(new EntityWrapper<TCompanyCity>().eq("companyId", id));
JSONArray jsonArray = JSON.parseArray(subArr);
int size = jsonArray.size();
- for (int i = 0; i < size; i++){
+ List<TCompanyCity> list = new ArrayList<>();
+ for (int i = 0; i < size; i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
- 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.setCompanyId(id);
- tCompanyCity.setState(1);
- tCompanyCityService.insert(tCompanyCity);
- }
+ TCompanyCity tCompanyCity = new TCompanyCity();
+ tCompanyCity.setCityId(jsonObject.getInteger("cityId"));
+ tCompanyCity.setCompanyId(id);
+ tCompanyCity.setState(1);
+ list.add(tCompanyCity);
+ }
+ if(list.size() > 0){
+ tCompanyCityService.insertBatch(list);
}
}
@@ -354,9 +351,6 @@
return "error";
}
tCompany.setType(3); //2：分公司
- if (ShiroKit.getUser().getRoleType() == 2){
- tCompany.setSuperiorId(ShiroKit.getUser().getObjectId());
- }
tCompany.setState(0); //0：正常
tCompany.setInsertTime(new Date());
tCompanyService.insert(tCompany);
@@ -412,6 +406,7 @@
user.setSalt(ShiroKit.getRandomSalt(5));
user.setPassword(ShiroKit.md5(password, user.getSalt()));
}
+ tCompany.setSuperiorId(1);
tCompanyService.updateById(tCompany);
user.setName(tCompany.getName());
userService.updateById(user);
--
Gitblit v1.7.1