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和管理后台报表
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 158 insertions(+), 3 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
index 72c6d5c..8b6c035 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -18,6 +18,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -60,12 +61,166 @@
@Override
public Company query(String[] city) throws Exception {
- List<City> cities = cityService.selectList(new EntityWrapper<City>().in("chineseName", Arrays.asList(city)).or()
- .in("englishName", Arrays.asList(city)).or().in("frenchName", Arrays.asList(city)));
- List<Integer> collect = cities.stream().map(City::getId).collect(Collectors.toList());
+ List<City> cities1 = cityService.selectList(null);
+ List<Integer> collect = new ArrayList<>();
+ for (City city1 : cities1) {
+ String chineseName = city1.getChineseName();
+ String englishName = city1.getEnglishName();
+ String frenchName = city1.getFrenchName();
+ for (String s : city) {
+ if(s.equals(chineseName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.equals(englishName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.equals(frenchName)){
+ collect.add(city1.getId());
+ break;
+ }
+ }
+ }
+ if(collect.size() == 0){
+ for (City city1 : cities1) {
+ String chineseName = city1.getChineseName();
+ String englishName = city1.getEnglishName();
+ String frenchName = city1.getFrenchName();
+ for (String s : city) {
+ if(s.contains(chineseName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.contains(englishName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.contains(frenchName)){
+ collect.add(city1.getId());
+ break;
+ }
+ }
+ }
+ }
if(collect.size() == 0){
return null;
}
+ System.err.println("城市ids：" + collect);
return companyMapper.query(collect);
}
+
+
+ @Override
+ public Company query1(String[] city) throws Exception {
+ List<City> cities1 = cityService.selectList(null);
+ List<Integer> collect = new ArrayList<>();
+ for (City city1 : cities1) {
+ String chineseName = city1.getChineseName();
+ String englishName = city1.getEnglishName();
+ String frenchName = city1.getFrenchName();
+ for (String s : city) {
+ if(s.equals(chineseName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.equals(englishName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.equals(frenchName)){
+ collect.add(city1.getId());
+ break;
+ }
+ }
+ }
+ if(collect.size() == 0){
+ for (City city1 : cities1) {
+ String chineseName = city1.getChineseName();
+ String englishName = city1.getEnglishName();
+ String frenchName = city1.getFrenchName();
+ for (String s : city) {
+ if(s.contains(chineseName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.contains(englishName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.contains(frenchName)){
+ collect.add(city1.getId());
+ break;
+ }
+ }
+ }
+ }
+ List<Company> query = companyMapper.queryList1(collect, 3);
+ if(query.size() == 0){
+ query = companyMapper.queryList1(collect, 2);
+ }
+ if(query.size() == 0){
+ query = companyMapper.queryList1(collect, 1);
+ }
+ if(query.size() > 0){
+ return query.get(0);
+ }
+ return null;
+ }
+
+
+
+ @Override
+ public List<Company> query2(String[] city) throws Exception {
+ List<City> cities1 = cityService.selectList(null);
+ List<Integer> collect = new ArrayList<>();
+ for (City city1 : cities1) {
+ String chineseName = city1.getChineseName();
+ String englishName = city1.getEnglishName();
+ String frenchName = city1.getFrenchName();
+ for (String s : city) {
+ if(s.equals(chineseName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.equals(englishName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.equals(frenchName)){
+ collect.add(city1.getId());
+ break;
+ }
+ }
+ }
+ if(collect.size() == 0){
+ for (City city1 : cities1) {
+ String chineseName = city1.getChineseName();
+ String englishName = city1.getEnglishName();
+ String frenchName = city1.getFrenchName();
+ for (String s : city) {
+ if(s.contains(chineseName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.contains(englishName)){
+ collect.add(city1.getId());
+ break;
+ }
+ if(s.contains(frenchName)){
+ collect.add(city1.getId());
+ break;
+ }
+ }
+ }
+ }
+ List<Company> query = companyMapper.queryList1(collect, 3);
+ if(query.size() == 0){
+ query = companyMapper.queryList1(collect, 2);
+ }
+ if(query.size() == 0){
+ query = companyMapper.queryList1(collect, 1);
+ }
+ return query;
+ }
}
--
Gitblit v1.7.1