修复bug

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontUniversitiesController.java

@@ -34,9 +34,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.ruoyi.framework.datasource.DynamicDataSourceContextHolder.log;
 
 @RestController
 @Api(tags = "前端-三库-院校库")
@@ -110,7 +107,8 @@ public class FrontUniversitiesController extends BaseController {
     @Anonymous
     @ApiOperation("00 院校列表数据筛选项-地域 回传location和cityName")
     public AjaxResult locations2() {
-        List<BBusiWishUniversities> list = universitiesService.selectBBusiWishUniversitiesLocations2(ConstantUtil.getExamTypeData(VistorContextHolder.getExamType().title()));
+//        List<BBusiWishUniversities> list = universitiesService.selectBBusiWishUniversitiesLocations2(ConstantUtil.getExamTypeData(VistorContextHolder.getExamType().title()));
+        List<BBusiWishUniversities> list = universitiesService.selectBBusiWishUniversitiesLocations3(VistorContextHolder.getLocation());
 
         // 按location分组，收集每个location下的cityName
         Map<String, Set<String>> locationCityMap = list.stream()

ie-admin/src/main/java/com/ruoyi/web/service/VoluntaryService.java

@@ -160,6 +160,11 @@ public class VoluntaryService {
         return dzControl.getPlanYear();
     }
 
+    public Integer getPlanYear(String location, ExamType type) {
+        DzControl dzControl = dzControlService.selectDzControl(location, type);
+        return dzControl.getPlanYear();
+    }
+
     public Integer getSubmitYear() {
         return 2025;
     }

ie-system/src/main/java/com/ruoyi/syzy/mapper/BBusiWishUniversitiesMapper.java

@@ -45,6 +45,7 @@ public interface BBusiWishUniversitiesMapper {
     public List<BBusiWishUniversities> selectBBusiWishUniversitiesListSimple(BBusiWishUniversities bBusiWishUniversities);
     public List<BBusiWishUniversities> selectBBusiWishUniversitiesLocations(String entranceType);
     public List<BBusiWishUniversities> selectBBusiWishUniversitiesLocations2(String entranceType);
+    public List<BBusiWishUniversities> selectBBusiWishUniversitiesLocations3(String location);
     public List<BBusiWishUniversities> selectBBusiWishUniversitiesTypes(String entranceType);
     public List<BBusiWishUniversities> selectBBusiWishUniversitiesNatureTypes(String entranceType);
     public List<BBusiWishUniversities> selectBBusiWishUniversitiesFeatures(String entranceType);

ie-system/src/main/java/com/ruoyi/syzy/service/IBBusiWishUniversitiesService.java

@@ -61,6 +61,7 @@ public interface IBBusiWishUniversitiesService {
      */
     public UniversityDetailDTO detail(String code, Integer year);
     public List<BBusiWishUniversities> selectBBusiWishUniversitiesLocations2(String entranceType);
+    public List<BBusiWishUniversities> selectBBusiWishUniversitiesLocations3(String location);
     public List<String> getLocations(String entranceType);
     public List<String> getTypes(String entranceType);
     public List<String> getNatureTypeCN(String entranceType);

ie-system/src/main/java/com/ruoyi/syzy/service/impl/BBusiWishUniversitiesServiceImpl.java

@@ -114,6 +114,10 @@ public class BBusiWishUniversitiesServiceImpl implements IBBusiWishUniversitiesS
     public List<BBusiWishUniversities> selectBBusiWishUniversitiesLocations2(String entranceType) {
         return bBusiWishUniversitiesMapper.selectBBusiWishUniversitiesLocations2(entranceType);
     }
+    @Override
+    public List<BBusiWishUniversities> selectBBusiWishUniversitiesLocations3(String location) {
+        return bBusiWishUniversitiesMapper.selectBBusiWishUniversitiesLocations3(location);
+    }
 
     @Override
     public List<BBusiWishUniversities> selectBBusiWishUniversitiesTypes(String entranceType) {

ie-system/src/main/resources/mapper/syzy/BBusiWishUniversitiesMapper.xml

@@ -330,6 +330,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     ORDER BY CONVERT( location USING gbk ) COLLATE gbk_chinese_ci ASC
   </select>
 
+  <select id="selectBBusiWishUniversitiesLocations3" parameterType="String" resultMap="BBusiWishUniversitiesResult">
+    SELECT distinct location,cityName from b_busi_wish_universities where enrollLocation like concat ('%', #{location}, '%') or enrollLocation like concat ('%全国%')
+    ORDER BY CONVERT( location USING gbk ),CONVERT( cityName USING gbk ) COLLATE gbk_chinese_ci ASC
+  </select>
+
   <select id="selectBBusiWishUniversitiesTypes" parameterType="String" resultMap="BBusiWishUniversitiesResult">
     SELECT distinct type from b_busi_wish_universities where status>0 and type is not null and type !='' and entranceType = #{entranceType}
   </select>