完成用户第一阶段的需求

ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java

@@ -321,8 +321,8 @@ public class CjStudentServiceImpl implements ICjStudentService
             return null;
         }
 
-        String province = address.substring(0, provinceIndex + 1); // 包含"省"
-        String city = address.substring(provinceIndex + 1, cityIndex + 1); // 从省后到"市"结束
+        String province = address.substring(0, provinceIndex ); // 不包含"省"
+        String city = address.substring(provinceIndex + 1, cityIndex); // 从省后到"市"结束
 
         Map<String, String> result = new HashMap<>();
         result.put("province", province);

ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml

@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from cj_student
         where sfqr = 1
           and cast(bynf as unsigned)
-              between  YEAR(CURRENT_DATE) - #{year} + 1 and YEAR(CURRENT_DATE)
+              between  YEAR(CURRENT_DATE) - #{year} and YEAR(CURRENT_DATE)
         group by bynf order by bynf desc
     </select>
 
@@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM cj_student
         where sfqr = 1 and sydsh is not null
           and cast(bynf as unsigned)
-            between  YEAR(CURRENT_DATE) - #{year} + 1 and YEAR(CURRENT_DATE)
+            between  YEAR(CURRENT_DATE) - #{year} and YEAR(CURRENT_DATE)
         GROUP BY
             CASE
                 WHEN sydsh = '山东' THEN sydshi