feat: 修改查询单位接口，修复一房产一局址维修分月错误，修复不动产管理策略-维修异常监控-高总价统计错误

pom.xml

@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.4.1</version>
+            <version>3.5.5</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -122,6 +122,28 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.github.jsqlparser</groupId>
+                <artifactId>jsqlparser</artifactId>
+                <version>4.6</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>1.24.0</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.checkerframework</groupId>
+                <artifactId>checker-qual</artifactId>
+                <version>3.33.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>9.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

src/main/java/com/example/config/MybatisPlusConfig.java

@@ -1,22 +1,22 @@
-//package com.example.config;
-//
-//import com.baomidou.mybatisplus.annotation.DbType;
-//import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-//import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-///**
-// * mybatis +配置
-// *
-// */
-//@Configuration
-//public class MybatisPlusConfig {
-//    @Bean
-//    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-//        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-//        // 添加分页拦截器
-//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
-//        return interceptor;
-//    }
-//}
+package com.example.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * mybatis +配置
+ *
+ */
+@Configuration
+public class MybatisPlusConfig {
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 添加分页拦截器
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
+        return interceptor;
+    }
+}

src/main/java/com/example/controller/TestController.java

@@ -0,0 +1,26 @@
+package com.example.controller;
+
+import cn.hutool.core.util.IdUtil;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Hidden
+@Tag(name = "测试")
+@Slf4j
+@RequestMapping("/test")
+@RestController
+public class TestController {
+    /**
+     * 短信告警测试
+     */
+    @Operation(summary = "短信告警测试")
+    @GetMapping("/alert")
+    public Object alert() {
+        throw new RuntimeException("短信告警测试: " + IdUtil.fastSimpleUUID());
+    }
+}

src/main/java/com/example/controller/WzBuildManageDetailsController.java

@@ -1,14 +1,15 @@
 package com.example.controller;
 
 import com.example.config.annotation.IgnoreAuth;
+import com.example.dao.WzHouseMaintenaCostDao;
 import com.example.entity.OtnAreaEntity;
 import com.example.entity.WzBuildManageDetailsEntity;
 import com.example.entity.WzHouseMaintenaCostEntity;
-import com.example.entity.WzStrategyEntity;
 import com.example.entity.vo.BuildManageVo;
 import com.example.entity.vo.housemanager.HouseYearVo;
 import com.example.entity.vo.housemanager.LeaveUseVo;
 import com.example.entity.vo.housemanager.WzBuildmanageAvageareaVo;
+import com.example.pojo.vo.HouseStaticVo;
 import com.example.service.WzBuildManageDetailsService;
 import com.example.service.WzBuildmanageAvageareaService;
 import com.example.service.WzHouseMaintenaCostService;
@@ -19,7 +20,6 @@ import com.example.utils.PageUtils;
 import com.example.utils.Query;
 import com.example.utils.R;
 import com.example.utils.excel.ExcelExport;
-import com.example.vo.HouseStaticVo;
 import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.kernel.font.PdfFontFactory;
 import com.itextpdf.kernel.geom.PageSize;
@@ -46,6 +46,8 @@ import java.io.ByteArrayOutputStream;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -67,6 +69,8 @@ public class WzBuildManageDetailsController {
     private WzOtnAreaService otnAreaService;
     @Autowired
     private WzStrategyService wzStrategyService;
+    @Autowired
+    private WzHouseMaintenaCostDao wzHouseMaintenaCostDao;
 
     /**
      * 房屋管理-->闲置管理看板
@@ -265,7 +269,7 @@ public class WzBuildManageDetailsController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
         List<HouseYearVo> orderList = new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {
@@ -296,29 +300,29 @@ public class WzBuildManageDetailsController {
     }
 
 
-    /**
-     * 房屋管理-->闲置管理看板
-     */
-    @RequestMapping("/ideList")
-    @IgnoreAuth
-    public R ideList(@RequestBody PageMap pageMap) {
-        //查询列表数据
-        Query query = new Query(pageMap);
-        int value=1000;
-        //获取配置参数
-        WzStrategyEntity objectByType = wzStrategyService.getObjectByType();
-        if(objectByType!=null){
-            String[] values=objectByType.getValue().split(",");
-            value=Integer.valueOf(values[0]);
-        }
-        query.put("buildingAreaIdelArea", value);
-        List<WzBuildManageDetailsEntity> resultList = wzBuildManageDetailsService.queryList(query);
-        Query query1 = new Query(pageMap);
-        query1.put("buildingAreaIdelArea", value);
-        int total = wzBuildManageDetailsService.queryTotal(query1);
-        PageUtils pageUtil = new PageUtils(resultList, total, 10, 10);
-        return R.ok().put("page", pageUtil);
-    }
+//    /**
+//     * 房屋管理-->闲置管理看板
+//     */
+//    @RequestMapping("/ideList")
+//    @IgnoreAuth
+//    public R ideList(@RequestBody PageMap pageMap) {
+//        //查询列表数据
+//        Query query = new Query(pageMap);
+//        int value=1000;
+//        //获取配置参数
+//        WzStrategyEntity objectByType = wzStrategyService.getObjectByType();
+//        if(objectByType!=null){
+//            String[] values=objectByType.getValue().split(",");
+//            value=Integer.valueOf(values[0]);
+//        }
+//        query.put("buildingAreaIdelArea", value);
+//        List<WzBuildManageDetailsEntity> resultList = wzBuildManageDetailsService.queryList(query);
+//        Query query1 = new Query(pageMap);
+//        query1.put("buildingAreaIdelArea", value);
+//        int total = wzBuildManageDetailsService.queryTotal(query1);
+//        PageUtils pageUtil = new PageUtils(resultList, total, 10, 10);
+//        return R.ok().put("page", pageUtil);
+//    }
 
     /**
      * 房产详情
@@ -617,7 +621,7 @@ public class WzBuildManageDetailsController {
                 cityList.add(cityObject);
             }
             //对cityList 进行排序
-            List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+            List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
             List<WzBuildmanageAvageareaVo> orderList = new ArrayList<>();
             for (OtnAreaEntity otnAreaEntity : areaList) {
                 for (WzBuildmanageAvageareaVo wzCity : cityList) {
@@ -836,7 +840,7 @@ public class WzBuildManageDetailsController {
             }
 
             //对cityList 进行排序
-            List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+            List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
             List<LeaveUseVo> orderList = new ArrayList<>();
             for (OtnAreaEntity otnAreaEntity : areaList) {
                 for (LeaveUseVo wzCity : cityList) {
@@ -1107,7 +1111,7 @@ public class WzBuildManageDetailsController {
             }
 
             //对cityList 进行排序
-            List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+            List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
             List<HouseYearVo> orderList = new ArrayList<>();
             for (OtnAreaEntity otnAreaEntity : areaList) {
                 for (HouseYearVo wzCity : cityList) {
@@ -1343,11 +1347,30 @@ public class WzBuildManageDetailsController {
             query.put("limit",12);
         }
 
-        Integer month= 202311;
+        Integer month = null;
+        Integer startMonth = null;
         if(query1.get("statisticalMonth")!=null&&!query1.get("statisticalMonth").toString().equals("")){
+            String statisticalMonth = (String) query1.get("statisticalMonth");
+            // 结束账期
+            LocalDate endLocalDate = LocalDate.parse(statisticalMonth + "01", DateTimeFormatter.ofPattern("yyyyMMdd"));
+            // 开始账期
+            LocalDate startLocalDate = endLocalDate.withDayOfYear(1);
+            String startStaticalMonth = startLocalDate.format(DateTimeFormatter.ofPattern("yyyyMM"));
+            startMonth = Integer.valueOf(startStaticalMonth);
             query1.put("statisticalMonth1",query1.get("statisticalMonth"));
-            query1.remove("statisticalMonth");
+//            query1.remove("statisticalMonth");
+            query1.put("statisticalMonth", startStaticalMonth);
             month=Integer.valueOf(query1.get("statisticalMonth1").toString());
+        } else {
+            month = wzHouseMaintenaCostDao.getLatestDate();
+            // 结束账期
+            LocalDate endLocalDate = LocalDate.parse(month + "01", DateTimeFormatter.ofPattern("yyyyMMdd"));
+            // 开始账期
+            LocalDate startLocalDate = endLocalDate.withDayOfYear(1);
+            String startStaticalMonth = startLocalDate.format(DateTimeFormatter.ofPattern("yyyyMM"));
+            query1.put("statisticalMonth1",query1.get("statisticalMonth"));
+            query1.put("statisticalMonth", startStaticalMonth);
+            startMonth = Integer.valueOf(startStaticalMonth);
         }
 
         List<WzBuildManageDetailsEntity> list = wzBuildManageDetailsService.queryList(query);
@@ -1374,7 +1397,7 @@ public class WzBuildManageDetailsController {
             }
         }
         //key的转换
-        for(int i=202301;i<month+1;i++){
+        for(int i=startMonth;i<month+1;i++){
             if(costMap.get(i+"")==null){
                 costMap.put(i+"", 0.0);
             }
@@ -1383,40 +1406,40 @@ public class WzBuildManageDetailsController {
         Map<String,Double> _costMap=new HashMap<>();
         for(Map.Entry<String,Double> entry:costMap.entrySet()){
             String key="";
-            if(entry.getKey().contains("202301")){
+            if(entry.getKey().contains("01")){
                 key="one";
             }
-            if(entry.getKey().contains("202302")){
+            if(entry.getKey().contains("02")){
                 key="two";
             }
-            if(entry.getKey().contains("202303")){
+            if(entry.getKey().contains("03")){
                 key="thr";
             }
-            if(entry.getKey().contains("202304")){
+            if(entry.getKey().contains("04")){
                 key="fou";
             }
-            if(entry.getKey().contains("202305")){
+            if(entry.getKey().contains("05")){
                 key="fiv";
             }
-            if(entry.getKey().contains("202306")){
+            if(entry.getKey().contains("06")){
                 key="six";
             }
-            if(entry.getKey().contains("202307")){
+            if(entry.getKey().contains("07")){
                 key="sev";
             }
-            if(entry.getKey().contains("202308")){
+            if(entry.getKey().contains("08")){
                 key="eig";
             }
-            if(entry.getKey().contains("202309")){
+            if(entry.getKey().contains("09")){
                 key="nic";
             }
-            if(entry.getKey().contains("202310")){
+            if(entry.getKey().contains("10")){
                 key="ten";
             }
-            if(entry.getKey().contains("202311")){
+            if(entry.getKey().contains("11")){
                 key="twi";
             }
-            if(entry.getKey().contains("202312")){
+            if(entry.getKey().contains("12")){
                 key="twt";
             }
             _costMap.put(key,formatDouble(entry.getValue()));

src/main/java/com/example/controller/WzBuildmanageAvageareaController.java

@@ -147,7 +147,7 @@ public class WzBuildmanageAvageareaController {
             cityList.add(cityObject);
         }
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
         List<WzBuildmanageAvageareaVo> orderList = new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {

src/main/java/com/example/controller/WzHouseArrearsManageController.java

@@ -181,7 +181,7 @@ public class WzHouseArrearsManageController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseArrearsManageEntity> orderList=new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {

src/main/java/com/example/controller/WzHouseContracController.java

@@ -187,7 +187,7 @@ public class WzHouseContracController {
 
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseContracEntity> orderList=new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {
@@ -381,7 +381,7 @@ public class WzHouseContracController {
 
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseContracEntity> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzHouseContracEntity wzCity : cityList) {
@@ -523,7 +523,7 @@ public class WzHouseContracController {
             cityList.add(list.get(0));
         }
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseCustomerEntity> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzHouseCustomerEntity wzCity : cityList) {
@@ -718,7 +718,7 @@ public class WzHouseContracController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseArrearsManageEntity> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzHouseArrearsManageEntity wzCity : cityList) {

src/main/java/com/example/controller/WzHouseContractCompareController.java

@@ -168,7 +168,7 @@ public class WzHouseContractCompareController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<RentInVo> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (RentInVo wzCity : cityList) {

src/main/java/com/example/controller/WzHouseContractInController.java

@@ -167,7 +167,7 @@ public class WzHouseContractInController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<RentInVo> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (RentInVo wzCity : cityList) {

src/main/java/com/example/controller/WzHouseContractTopController.java

@@ -175,7 +175,7 @@ public class WzHouseContractTopController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<RentInVo> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (RentInVo wzCity : cityList) {

src/main/java/com/example/controller/WzHouseCustomerController.java

@@ -108,7 +108,7 @@ public class WzHouseCustomerController {
             cityList.add(list.get(0));
         }
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseCustomerEntity> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzHouseCustomerEntity wzCity : cityList) {

src/main/java/com/example/controller/WzHouseInCustomerController.java

@@ -187,7 +187,7 @@ public class WzHouseInCustomerController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseInCustomerEntity> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzHouseInCustomerEntity wzCity : cityList) {

src/main/java/com/example/controller/WzHouseLeaseInConController.java

@@ -225,7 +225,7 @@ public class WzHouseLeaseInConController {
 
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseLeaseInConEntity> orderList=new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {
@@ -458,7 +458,7 @@ public class WzHouseLeaseInConController {
 
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseLeaseInConEntity> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzHouseLeaseInConEntity wzCity : cityList) {
@@ -684,7 +684,7 @@ public class WzHouseLeaseInConController {
 
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseUseVo> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzHouseUseVo wzCity : cityList) {

src/main/java/com/example/controller/WzHouseMaintController.java

@@ -37,7 +37,7 @@ public class WzHouseMaintController {
         Query query = new Query(pageMap);
         List<WzHouseMaintEntity> list = wzHouseMaintService.queryList(pageMap.getMap());
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
         List<WzHouseMaintEntity> orderList = new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzHouseMaintEntity wzCity : list) {

src/main/java/com/example/controller/WzHouseMaintenaCostController.java

@@ -246,7 +246,7 @@ public class WzHouseMaintenaCostController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
         List<HouseCostVo> orderList = new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {
@@ -586,7 +586,7 @@ public class WzHouseMaintenaCostController {
     public void responseTab5(DateFormat df, ExcelExport ee1, Map<String, Object> map1) {
         List<WzHouseMaintEntity> list = wzHouseMaintService.queryList(map1);
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
         List<WzHouseMaintEntity> resultList = new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzHouseMaintEntity wzCity : list) {
@@ -632,21 +632,21 @@ public class WzHouseMaintenaCostController {
     /**
      * 高总价统计
      */
-    @RequestMapping("/queryHighPrice")
-    @IgnoreAuth
-    public R queryHighPrice(@RequestBody PageMap pageMap) {
-        Query query = new Query(pageMap);
-        WzStrategyEntity objectByType = wzStrategyService.getObjectByType();
-        int value=0;
-        if(objectByType!=null){
-            String[] values=objectByType.getValue().split(",");
-            value=Integer.valueOf(values[2]);
-            query.put("erpCreditedAmount", value);
-        }
-        List<WzHouseMaintenaCostEntity> highPriceList = wzHouseMaintenaCostService.queryHighPrice(query);
-        PageUtils pageUtil = new PageUtils(highPriceList, highPriceList.size(), 10, 10);
-        return R.ok().put("page", pageUtil);
-    }
+//    @RequestMapping("/queryHighPrice")
+//    @IgnoreAuth
+//    public R queryHighPrice(@RequestBody PageMap pageMap) {
+//        Query query = new Query(pageMap);
+//        WzStrategyEntity objectByType = wzStrategyService.getObjectByType();
+//        int value=0;
+//        if(objectByType!=null){
+//            String[] values=objectByType.getValue().split(",");
+//            value=Integer.valueOf(values[2]);
+//            query.put("erpCreditedAmount", value);
+//        }
+//        List<WzHouseMaintenaCostEntity> highPriceList = wzHouseMaintenaCostService.queryHighPrice(query);
+//        PageUtils pageUtil = new PageUtils(highPriceList, highPriceList.size(), 10, 10);
+//        return R.ok().put("page", pageUtil);
+//    }
 
     /**
      * 日常零星维修
@@ -873,7 +873,7 @@ public class WzHouseMaintenaCostController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
         List<HouseCostVo> orderList = new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (HouseCostVo wzCity : cityList) {

src/main/java/com/example/controller/WzHouseUseController.java

@@ -185,7 +185,7 @@ public class WzHouseUseController {
 
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseUseVo> orderList=new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {

src/main/java/com/example/controller/WzLandManageDetailsController.java

@@ -203,7 +203,7 @@ public class WzLandManageDetailsController {
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<FloorNoUserVo> orderList=new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {
@@ -534,7 +534,7 @@ public class WzLandManageDetailsController {
             }
 
             //对cityList 进行排序
-            List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+            List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
             List<FloorNoUserVo> orderList=new ArrayList<>();
             for (OtnAreaEntity otnAreaEntity : areaList) {
                 for (FloorNoUserVo wzCity : cityList) {

src/main/java/com/example/controller/WzOtnAreaController.java

@@ -1,137 +1,134 @@
-package com.example.controller;
-
-import cn.hutool.poi.excel.WorkbookUtil;
-import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseContractCompareEntity;
-import com.example.service.WzHouseContractCompareService;
-import com.example.service.WzHouseContractTopService;
-import com.example.service.WzOtnAreaService;
-import com.example.utils.PageMap;
-import com.example.utils.PageUtils;
-import com.example.utils.Query;
-import com.example.utils.R;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.File;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.example.utils.excel.ExcelTool.getCellValue;
-
-/**
- * 房屋出租(合同管理)
- */
-@RestController
-@RequestMapping("/house-car/house/dist/api/wzOtnArea")
-public class WzOtnAreaController {
-
-    @Autowired
-    private WzOtnAreaService wzOtnAreaService;
-    @Autowired
-    private WzHouseContractTopService wzHouseContractTopService;
-    @Autowired
-    private WzHouseContractCompareService wzHouseContractCompareService;
-
-    @RequestMapping("/list")
-    @IgnoreAuth
-    public R list(@RequestBody PageMap pageMap) {
-        //查询列表数据
-        Query query = new Query(pageMap);
-        List<OtnAreaEntity> list = wzOtnAreaService.queryList(query);
-        int total = wzOtnAreaService.queryTotal(query);
-        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
-        return R.ok().put("page", pageUtil);
-    }
-
-    /**
-     *  查找所有的省份
-     */
-    @RequestMapping("/getCityOption/{id}")
-    @IgnoreAuth
-    public R getCityOption(@PathVariable("id") String id) {
-        List<OtnAreaEntity> list=wzOtnAreaService.getCityOption(Long.valueOf(id));
-        return R.ok().put("list",list);
-    }
-
-
-    /**
-     * 导入Excel
-     */
-    @PostMapping("/import")
-    @IgnoreAuth
-    public R importExcel(){
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        OtnAreaEntity sysConfig;
-        int errorIndex = 0;
-        try {
-            String[] title = new String[]{
-                    "使用单位层级","使用单位隶属的省级公司","使用单位隶属的地市级公司",
-                    "使用单位隶属的区县级公司",	"使用专业线","租入实际用途",
-                    "租入其他用途说明","城市区域","地段","合同总金额(含税)(元)","租入建筑面积(平米)", "租期（年）","每平米月租金","","",
-                    "合同编号","合同名称"
-            };
-            File file=new File("C:\\Users\\PRO\\Desktop\\版本\\version3\\test1.xlsx");
-            List<String[]> list = new ArrayList();
-            Workbook workbook = WorkbookUtil.createBook(file);
-            // 获取第一张工作表
-            Sheet sheet =  workbook.getSheetAt(0);
-            // 循环获取每一行数据 因为默认第一行为标题行，我们可以从 1 开始循环，如果需要读取标题行，从 0 开始
-            // sheet.getRows() 获取总行数
-            Row row;
-            for (int i = sheet.getFirstRowNum() + 1; i <= sheet.getLastRowNum(); i++) {
-                row = sheet.getRow(i);
-                System.out.println(i);
-                if (i >= 1 && row != null && row.getCell(0) != null && !row.getCell(0).toString().equals("")) {
-                    String[] t = new String[title.length];
-                    for (int m = 0; m < title.length; m++) {
-                        Cell cell = row.getCell(m);
-                        t[m] = getCellValue(cell);
-                    }
-                    list.add(t);
-                }
-            }
-            for(int i=0;i<list.size();i++){
-                WzHouseContractCompareEntity topEntity=new WzHouseContractCompareEntity();
-                topEntity.setUseTheUnitsHierarchy(list.get(i)[0]);
-                topEntity.setProvince(list.get(i)[1]);
-                topEntity.setCity(list.get(i)[2]);
-                topEntity.setCounty(list.get(i)[3]);
-                topEntity.setUseTheProLine(list.get(i)[4]);
-                topEntity.setLeaseInPracticalUse(list.get(i)[5]);
-                topEntity.setDescriptionOfOtherUsesOfTheLease(list.get(i)[6]);
-                topEntity.setCityArea(list.get(i)[7]);
-                topEntity.setDistrict(list.get(i)[8]);
-                topEntity.setRentalBuildingArea(list.get(i)[9]);
-                topEntity.setHireTime(list.get(i)[10]);
-                topEntity.setTotalMonthlyRent(list.get(i)[11]);
-                topEntity.setContractAmountIncludingTax(list.get(i)[12]);
-                topEntity.setFtProvinceAverage(list.get(i)[13]);
-                topEntity.setPriceProvinceAverage(list.get(i)[14]);
-                topEntity.setContractNumber(list.get(i)[15]);
-                topEntity.setContractName(list.get(i)[16]);
-                wzHouseContractCompareService.save(topEntity);
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            return R.error("第"+(errorIndex)+"行数据有问题，导入失败");
-        }
-        return R.ok();
-    }
-
-
-
-
-}
+//package com.example.controller;
+//
+//import cn.hutool.poi.excel.WorkbookUtil;
+//import com.example.config.annotation.IgnoreAuth;
+//import com.example.entity.OtnAreaEntity;
+//import com.example.entity.WzHouseContractCompareEntity;
+//import com.example.service.WzHouseContractCompareService;
+//import com.example.service.WzHouseContractTopService;
+//import com.example.service.WzOtnAreaService;
+//import com.example.utils.PageMap;
+//import com.example.utils.PageUtils;
+//import com.example.utils.R;
+//import org.apache.poi.ss.usermodel.Cell;
+//import org.apache.poi.ss.usermodel.Row;
+//import org.apache.poi.ss.usermodel.Sheet;
+//import org.apache.poi.ss.usermodel.Workbook;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.PathVariable;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.io.File;
+//import java.text.DateFormat;
+//import java.text.SimpleDateFormat;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import static com.example.utils.excel.ExcelTool.getCellValue;
+//
+///**
+// * 房屋出租(合同管理)
+// */
+//@RestController
+//@RequestMapping("/house-car/house/dist/api/wzOtnArea")
+//public class WzOtnAreaController {
+//
+//    @Autowired
+//    private WzOtnAreaService wzOtnAreaService;
+//    @Autowired
+//    private WzHouseContractTopService wzHouseContractTopService;
+//    @Autowired
+//    private WzHouseContractCompareService wzHouseContractCompareService;
+//
+//    @RequestMapping("/list")
+//    @IgnoreAuth
+//    public R list(@RequestBody PageMap pageMap) {
+//        //查询列表数据
+//        Query query = new Query(pageMap);
+//        List<OtnAreaEntity> list = wzOtnAreaService.queryList(query);
+//        int total = wzOtnAreaService.queryTotal(query);
+//        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
+//        return R.ok().put("page", pageUtil);
+//    }
+//
+//    /**
+//     *  查找所有的省份
+//     */
+//    @RequestMapping("/getCityOption/{id}")
+//    @IgnoreAuth
+//    public R getCityOption(@PathVariable("id") String id) {
+//        List<OtnAreaEntity> list=wzOtnAreaService.getCityOption(Long.valueOf(id));
+//        return R.ok().put("list",list);
+//    }
+//
+//
+//    /**
+//     * 导入Excel
+//     */
+////    @PostMapping("/import")
+//    @IgnoreAuth
+//    public R importExcel(){
+//        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+//        OtnAreaEntity sysConfig;
+//        int errorIndex = 0;
+//        try {
+//            String[] title = new String[]{
+//                    "使用单位层级","使用单位隶属的省级公司","使用单位隶属的地市级公司",
+//                    "使用单位隶属的区县级公司",	"使用专业线","租入实际用途",
+//                    "租入其他用途说明","城市区域","地段","合同总金额(含税)(元)","租入建筑面积(平米)", "租期（年）","每平米月租金","","",
+//                    "合同编号","合同名称"
+//            };
+//            File file=new File("C:\\Users\\PRO\\Desktop\\版本\\version3\\test1.xlsx");
+//            List<String[]> list = new ArrayList();
+//            Workbook workbook = WorkbookUtil.createBook(file);
+//            // 获取第一张工作表
+//            Sheet sheet =  workbook.getSheetAt(0);
+//            // 循环获取每一行数据 因为默认第一行为标题行，我们可以从 1 开始循环，如果需要读取标题行，从 0 开始
+//            // sheet.getRows() 获取总行数
+//            Row row;
+//            for (int i = sheet.getFirstRowNum() + 1; i <= sheet.getLastRowNum(); i++) {
+//                row = sheet.getRow(i);
+//                System.out.println(i);
+//                if (i >= 1 && row != null && row.getCell(0) != null && !row.getCell(0).toString().equals("")) {
+//                    String[] t = new String[title.length];
+//                    for (int m = 0; m < title.length; m++) {
+//                        Cell cell = row.getCell(m);
+//                        t[m] = getCellValue(cell);
+//                    }
+//                    list.add(t);
+//                }
+//            }
+//            for(int i=0;i<list.size();i++){
+//                WzHouseContractCompareEntity topEntity=new WzHouseContractCompareEntity();
+//                topEntity.setUseTheUnitsHierarchy(list.get(i)[0]);
+//                topEntity.setProvince(list.get(i)[1]);
+//                topEntity.setCity(list.get(i)[2]);
+//                topEntity.setCounty(list.get(i)[3]);
+//                topEntity.setUseTheProLine(list.get(i)[4]);
+//                topEntity.setLeaseInPracticalUse(list.get(i)[5]);
+//                topEntity.setDescriptionOfOtherUsesOfTheLease(list.get(i)[6]);
+//                topEntity.setCityArea(list.get(i)[7]);
+//                topEntity.setDistrict(list.get(i)[8]);
+//                topEntity.setRentalBuildingArea(list.get(i)[9]);
+//                topEntity.setHireTime(list.get(i)[10]);
+//                topEntity.setTotalMonthlyRent(list.get(i)[11]);
+//                topEntity.setContractAmountIncludingTax(list.get(i)[12]);
+//                topEntity.setFtProvinceAverage(list.get(i)[13]);
+//                topEntity.setPriceProvinceAverage(list.get(i)[14]);
+//                topEntity.setContractNumber(list.get(i)[15]);
+//                topEntity.setContractName(list.get(i)[16]);
+//                wzHouseContractCompareService.save(topEntity);
+//            }
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return R.error("第"+(errorIndex)+"行数据有问题，导入失败");
+//        }
+//        return R.ok();
+//    }
+//
+//
+//
+//
+//}

src/main/java/com/example/controller/WzScoreRankingController.java

@@ -120,7 +120,7 @@ public class WzScoreRankingController {
             }
         }
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzScoreRankingEntity> orderList=new ArrayList<>();
         for (OtnAreaEntity otnAreaEntity : areaList) {
             for (WzScoreRankingEntity wzCity : allList) {

src/main/java/com/example/controller/HouseDataImportController.java → src/main/java/com/example/controller/house/HouseDataImportController.java

@@ -1,8 +1,8 @@
-package com.example.controller;
+package com.example.controller.house;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.dto.HouseDataImportDto;
-import com.example.service.HouseDataImportService;
+import com.example.pojo.dto.HouseDataImportDto;
+import com.example.service.house.HouseDataImportService;
 import com.example.utils.R;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/example/controller/house/HouseWzHouseMaintenaCostController.java

@@ -0,0 +1,39 @@
+package com.example.controller.house;
+
+import com.example.pojo.dto.ListBuildingHighRepairDto;
+import com.example.service.house.HouseWzHouseMaintenaCostService;
+import com.example.utils.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+@Tag(name = "不动产管理策略-维修异常监控")
+@Slf4j
+@RequestMapping("/house-car/house/dist/api/wzHouseMaintenaCost")
+@RestController
+public class HouseWzHouseMaintenaCostController {
+    private final HouseWzHouseMaintenaCostService houseWzHouseMaintenaCostService;
+
+    public HouseWzHouseMaintenaCostController(HouseWzHouseMaintenaCostService houseWzHouseMaintenaCostService) {
+        this.houseWzHouseMaintenaCostService = houseWzHouseMaintenaCostService;
+    }
+
+    @Operation(summary = "高总价统计")
+    @PostMapping("/queryHighPrice")
+    public R queryHighPrice(@Valid @RequestBody ListBuildingHighRepairDto dto) {
+        return houseWzHouseMaintenaCostService.queryHighPrice(dto);
+    }
+
+    @Operation(summary = "高总价统计导出")
+    @GetMapping("/queryHighPriceExport")
+    public void queryHighPriceExport(@Valid ListBuildingHighRepairDto dto) {
+        houseWzHouseMaintenaCostService.queryHighPriceExport(dto);
+    }
+}

src/main/java/com/example/controller/house/HouseWzOtnAreaController.java

@@ -0,0 +1,29 @@
+package com.example.controller.house;
+
+import com.example.service.house.HouseWzOtnAreaService;
+import com.example.utils.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "不动产组织机构")
+@Slf4j
+@RequestMapping("/house-car/house/dist/api/wzOtnArea")
+@RestController
+public class HouseWzOtnAreaController {
+    private final HouseWzOtnAreaService houseWzOtnAreaService;
+
+    public HouseWzOtnAreaController(HouseWzOtnAreaService houseWzOtnAreaService) {
+        this.houseWzOtnAreaService = houseWzOtnAreaService;
+    }
+
+    @Operation(summary = "根据父级组织机构id查询子组织机构列表")
+    @PostMapping("/getCityOption/{id}")
+    public R getCityOption(@PathVariable("id") String id) {
+        return houseWzOtnAreaService.getCityOption(id);
+    }
+}

src/main/java/com/example/dao/WzHouseMaintenaCostDao.java

@@ -6,12 +6,17 @@ import com.example.entity.vo.DailyModifyVo;
 import com.example.entity.vo.HighFrequencyVo;
 import com.example.utils.Query;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
 
 @Mapper
 public interface WzHouseMaintenaCostDao extends ExBaseMapper<WzHouseMaintenaCostEntity> {
+    @Select("""
+select max(statistical_month) from house_theme.wz_f_housermaintenance_maintenance_cost_detailed
+""")
+    Integer getLatestDate();
     List<WzHouseMaintenaCostEntity> queryHighPrice(Map map);
 
     List<HighFrequencyVo> queryHighFrequency(Map map);

src/main/java/com/example/dao/WzOtnAreaDao.java

@@ -3,11 +3,75 @@ package com.example.dao;
 import com.example.config.mybatis.ex.method.ExBaseMapper;
 import com.example.entity.OtnAreaEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
 @Mapper
 public interface WzOtnAreaDao extends ExBaseMapper<OtnAreaEntity> {
+    /**
+     * 根据父级组织机构id查询子组织机构
+     * @param parentId 父级组织机构id
+     */
+    @Select("""
+select
+    id,
+    '河北' as province,
+    name,
+    grade as level,
+    order_num as weight,
+    parent_id
+from
+    common.organization
+where
+    unhide = 1
+    and parent_id = #{parentId}
+order by
+    order_num
+""")
+    List<OtnAreaEntity> listByParentId(@Param("parentId") String parentId);
+
+    /**
+     * 根据id查询组织机构
+     * @param id 组织机构id
+     */
+    @Select("""
+select
+    id,
+    '河北' as province,
+    name,
+    grade as level,
+    order_num as weight,
+    parent_id
+from
+    common.organization
+where
+    unhide = 1
+    and id = #{id}
+""")
+    OtnAreaEntity getById(@Param("id") String id);
+
+    /**
+     * 根据组织机构名称查询组织机构
+     * @param name 组织机构名称
+     */
+    @Select("""
+select
+    id,
+    '河北' as province,
+    name,
+    grade as level,
+    order_num as weight,
+    parent_id
+from
+    common.organization
+where
+    unhide = 1
+    and name = #{name}
+limit 1
+""")
+    OtnAreaEntity getByName(@Param("name") String name);
 
     List<OtnAreaEntity> getCityOption(Long parentId);
 

src/main/java/com/example/dao/house/HouseRepairExceptionDao.java

@@ -0,0 +1,38 @@
+package com.example.dao.house;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.entity.house.HouseBuildingHighRepairPo;
+import com.example.pojo.bo.ListBuildingHighRepairBo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface HouseRepairExceptionDao {
+    @Select("""
+<script>
+select
+*
+from house.building_high_repair
+<where>
+  <choose>
+    <when test="dto.yearMonth != null">
+      year_month = #{dto.yearMonth}
+    </when>
+    <otherwise>
+      year_month = (select max(year_month) from house.building_high_repair)
+    </otherwise>
+  </choose>
+  <if test="dto.areaNo != null and dto.areaNo != ''">
+    and area_no = #{dto.areaNo}
+  </if>
+  <if test="dto.cityNo != null and dto.cityNo != ''">
+    and city_no = #{dto.cityNo}
+  </if>
+</where>
+</script>
+""")
+    List<HouseBuildingHighRepairPo> listBuildingHighRepair(Page<HouseBuildingHighRepairPo> page, @Param("dto") ListBuildingHighRepairBo dto);
+}

src/main/java/com/example/entity/OtnAreaEntity.java

@@ -1,5 +1,6 @@
 package com.example.entity;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -7,12 +8,17 @@ import java.io.Serializable;
 @Data
 public class OtnAreaEntity implements Serializable {
     private static final long serialVersionUID = 1L;
-
-    private Long id;
+    @Schema(description = "组织机构id")
+    private String id;
+    @Schema(description = "省份")
     private String province;
+    @Schema(description = "组织机构名称")
     private String name;
-    private int level;
-    private int weight;
-    private Long parentId;
+    @Schema(description = "组织机构级别")
+    private Integer level;
+    @Schema(description = "排序")
+    private Integer weight;
+    @Schema(description = "父级组织机构id")
+    private String parentId;
 
 }

src/main/java/com/example/entity/house/HouseBuildingHighRepairPo.java

@@ -0,0 +1,83 @@
+package com.example.entity.house;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@NoArgsConstructor
+@Data
+public class HouseBuildingHighRepairPo {
+    /**
+     * 账期
+     */
+    private Integer yearMonth;
+    /**
+     * 建筑id
+     */
+    private String buildingId;
+    /**
+     * 最近维修年月
+     */
+    private Integer latestRepairMonth;
+    /**
+     * 二级组织机构编码
+     */
+    private String areaNo;
+    /**
+     * 二级组织机构名称
+     */
+    private String areaName;
+    /**
+     * 三级组织机构编码
+     */
+    private String cityNo;
+    /**
+     * 三级组织机构名称
+     */
+    private String cityName;
+    /**
+     * 建筑别名
+     */
+    private String buildingName;
+    /**
+     * 维修类型
+     */
+    private String repairType;
+    /**
+     * 维修类容分类
+     */
+    private String contentCategory;
+    /**
+     * 累计维修
+     */
+    private BigDecimal finalCostSum;
+    /**
+     * 标准地址
+     */
+    private String address;
+    /**
+     * 建筑用途
+     */
+    private String buildingUse;
+    /**
+     * 建筑面积(㎡)
+     */
+    private BigDecimal buildingArea;
+    /**
+     * 建筑面积-自用(㎡)
+     */
+    private BigDecimal buildingAreaSelfUse;
+    /**
+     * 建筑面积-出租(㎡)
+     */
+    private BigDecimal buildingAreaRent;
+    /**
+     * 建筑面积-闲置(㎡)
+     */
+    private BigDecimal buildingAreaIdle;
+    /**
+     * 建筑面积-不可使用(㎡)
+     */
+    private BigDecimal buildingAreaUnusable;
+}

src/main/java/com/example/enums/ListBuildingHighRepairOrderEnum.java

@@ -0,0 +1,71 @@
+package com.example.enums;
+
+public enum ListBuildingHighRepairOrderEnum {
+    /**
+     * 入账日期
+     */
+    statisticalMonth("latest_repair_month"),
+    /**
+     * 二级单位
+     */
+    city("area_name"),
+    /**
+     * 三级单位
+     */
+    county("city_name"),
+    /**
+     * 建筑别名
+     */
+    buildingAlias("building_name"),
+    /**
+     * 维修类型
+     */
+    repairType("repair_type"),
+    /**
+     * 维修内容
+     */
+    repairContent("content_category"),
+    /**
+     * 累计维修
+     */
+    erpCreditedAmount("final_cost_sum"),
+    /**
+     * 标准地址
+     */
+    standardAddress("address"),
+    /**
+     * 建筑用途
+     */
+    buildingUse("building_use"),
+    /**
+     * 建筑面积
+     */
+    buildingArea("building_area"),
+    /**
+     * 建筑面积自用
+     */
+    buildingAreaUseArea("building_area_self_use"),
+    /**
+     * 建筑面积出租
+     */
+    buildingAreaRentArea("building_area_rent"),
+    /**
+     * 建筑面积闲置
+     */
+    buildingAreaIdelArea("building_area_idle"),
+    /**
+     * 建筑面积不可使用
+     */
+    buildingAreaUnavailable("building_area_unavailable"),
+    ;
+
+    private final String columnName;
+
+    ListBuildingHighRepairOrderEnum(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+}

src/main/java/com/example/enums/OrderEnum.java

@@ -0,0 +1,13 @@
+package com.example.enums;
+
+public enum OrderEnum {
+    /**
+     * 升序
+     */
+    asc,
+    /**
+     * 降序
+     */
+    desc,
+    ;
+}

src/main/java/com/example/pojo/bo/ListBuildingHighRepairBo.java

@@ -0,0 +1,14 @@
+package com.example.pojo.bo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class ListBuildingHighRepairBo {
+    @Schema(description = "账期")
+    private Integer yearMonth;
+    @Schema(description = "二级组织机构编码")
+    private String areaNo;
+    @Schema(description = "三级组织机构编码")
+    private String cityNo;
+}

src/main/java/com/example/dto/HouseDataImportDto.java → src/main/java/com/example/pojo/dto/HouseDataImportDto.java

@@ -1,4 +1,4 @@
-package com.example.dto;
+package com.example.pojo.dto;
 
 import com.example.enums.HouseDataImportEnum;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/com/example/pojo/dto/ListBuildingHighRepairDto.java

@@ -0,0 +1,34 @@
+package com.example.pojo.dto;
+
+import com.example.enums.ListBuildingHighRepairOrderEnum;
+import com.example.enums.OrderEnum;
+import com.example.utils.Page;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.Valid;
+
+@NoArgsConstructor
+@Data
+public class ListBuildingHighRepairDto {
+    @Valid
+    private Page page;
+    @Valid
+    private MapDTO map;
+
+    @NoArgsConstructor
+    @Data
+    public static class MapDTO {
+        @Schema(description = "账期")
+        private Integer statisticalMonth;
+        @Schema(description = "二级组织机构id")
+        private String city;
+        @Schema(description = "三级级组织机构id")
+        private String county;
+        @Schema(description = "排序字段")
+        private ListBuildingHighRepairOrderEnum sidx;
+        @Schema(description = "排序方式")
+        private OrderEnum order;
+    }
+}

src/main/java/com/example/dto/GetHouseDataImportTemplatesVo.java → src/main/java/com/example/pojo/vo/GetHouseDataImportTemplatesVo.java

@@ -1,4 +1,4 @@
-package com.example.dto;
+package com.example.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

src/main/java/com/example/vo/HouseStaticVo.java → src/main/java/com/example/pojo/vo/HouseStaticVo.java

@@ -1,4 +1,4 @@
-package com.example.vo;
+package com.example.pojo.vo;
 
 
 import lombok.Data;

src/main/java/com/example/pojo/vo/ListBuildingHighRepairVo.java

@@ -0,0 +1,56 @@
+package com.example.pojo.vo;
+
+import com.example.entity.house.HouseBuildingHighRepairPo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ListBuildingHighRepairVo {
+    @Schema(description = "维修类型")
+    private String repairType;
+    @Schema(description = "维修内容")
+    private String repairContent;
+    @Schema(description = "erp入账金额元")
+    private BigDecimal erpCreditedAmount;
+    @Schema(description = "资产所属单位二级")
+    private String city;
+    @Schema(description = "资产所属单位三级")
+    private String county;
+    @Schema(description = "标准地址")
+    private String standardAddress;
+    @Schema(description = "建筑别名")
+    private String buildingAlias;
+    @Schema(description = "建筑用途")
+    private String buildingUse;
+    @Schema(description = "建筑面积㎡")
+    private BigDecimal buildingArea;
+    @Schema(description = "建筑面积自用㎡")
+    private BigDecimal buildingAreaUseArea;
+    @Schema(description = "建筑面积出租㎡")
+    private BigDecimal buildingAreaRentArea;
+    @Schema(description = "建筑面积闲置㎡")
+    private BigDecimal buildingAreaIdelArea;
+    @Schema(description = "建筑面积不可使用㎡")
+    private BigDecimal buildingAreaUnavailable;
+    @Schema(description = "最近入账日期")
+    private Integer statisticalMonth;
+
+    public ListBuildingHighRepairVo(HouseBuildingHighRepairPo bo) {
+        this.repairType = bo.getRepairType();
+        this.repairContent = bo.getContentCategory();
+        this.erpCreditedAmount = bo.getFinalCostSum();
+        this.city = bo.getAreaName();
+        this.county = bo.getCityName();
+        this.standardAddress = bo.getAddress();
+        this.buildingAlias = bo.getBuildingName();
+        this.buildingUse = bo.getBuildingUse();
+        this.buildingArea = bo.getBuildingArea();
+        this.buildingAreaUseArea = bo.getBuildingAreaSelfUse();
+        this.buildingAreaRentArea = bo.getBuildingAreaRent();
+        this.buildingAreaIdelArea = bo.getBuildingAreaIdle();
+        this.buildingAreaUnavailable = bo.getBuildingAreaUnusable();
+        this.statisticalMonth = bo.getLatestRepairMonth();
+    }
+}

src/main/java/com/example/service/WzOtnAreaService.java

@@ -20,9 +20,9 @@ public interface WzOtnAreaService {
 
     int save(OtnAreaEntity otnAreaEntity);
 
-    List<OtnAreaEntity> getCityOption(Long valueOf);
+    List<OtnAreaEntity> getCityOption(String valueOf);
 
     OtnAreaEntity queryObject(String city);
 
-    OtnAreaEntity queryObjectById(Long city);
+    OtnAreaEntity queryObjectById(String city);
 }

src/main/java/com/example/service/HouseDataImportService.java → src/main/java/com/example/service/house/HouseDataImportService.java

@@ -1,7 +1,7 @@
-package com.example.service;
+package com.example.service.house;
 
-import com.example.dto.GetHouseDataImportTemplatesVo;
-import com.example.dto.HouseDataImportDto;
+import com.example.pojo.vo.GetHouseDataImportTemplatesVo;
+import com.example.pojo.dto.HouseDataImportDto;
 import com.example.enums.HouseDataImportEnum;
 import com.example.utils.R;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/example/service/house/HouseWzHouseMaintenaCostService.java

@@ -0,0 +1,213 @@
+package com.example.service.house;
+
+import cn.hutool.core.net.URLEncodeUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.dao.house.HouseRepairExceptionDao;
+import com.example.entity.house.HouseBuildingHighRepairPo;
+import com.example.enums.OrderEnum;
+import com.example.pojo.dto.ListBuildingHighRepairDto;
+import com.example.pojo.bo.ListBuildingHighRepairBo;
+import com.example.pojo.vo.ListBuildingHighRepairVo;
+import com.example.utils.PageUtils;
+import com.example.utils.R;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.DataFormat;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.xssf.streaming.SXSSFSheet;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+@Slf4j
+@Service
+public class HouseWzHouseMaintenaCostService {
+    private final HouseRepairExceptionDao houseRepairExceptionDao;
+
+    public HouseWzHouseMaintenaCostService(HouseRepairExceptionDao houseRepairExceptionDao) {
+        this.houseRepairExceptionDao = houseRepairExceptionDao;
+    }
+
+    public R queryHighPrice(ListBuildingHighRepairDto dto) {
+        Page<HouseBuildingHighRepairPo> page = new Page<>(dto.getPage().getPageNum(), dto.getPage().getPageSize());
+        List<HouseBuildingHighRepairPo> list = getHouseBuildingHighRepairPos(dto, page);
+        List<ListBuildingHighRepairVo> vos = new ArrayList<>();
+        for (HouseBuildingHighRepairPo po : list) {
+            vos.add(new ListBuildingHighRepairVo(po));
+        }
+        PageUtils pageUtil = new PageUtils(vos, page);
+        return R.ok().put("page", pageUtil);
+    }
+
+    public void queryHighPriceExport(ListBuildingHighRepairDto dto) {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder
+                .getRequestAttributes();
+        if (servletRequestAttributes == null) {
+            return;
+        }
+        HttpServletResponse response = servletRequestAttributes.getResponse();
+        if (response == null) {
+            return;
+        }
+        String filename = "维修异常监控_高总价统计"
+                + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx";
+        response.setHeader("Content-Disposition", "attachment;filename=" + URLEncodeUtil.encode(filename));
+        response.setContentType("application/octet-stream");
+        try (SXSSFWorkbook wb = new SXSSFWorkbook()) {
+            writeQueryHighPrice(dto, wb);
+            wb.write(response.getOutputStream());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    private List<HouseBuildingHighRepairPo> getHouseBuildingHighRepairPos(ListBuildingHighRepairDto dto,
+                                                                          Page<HouseBuildingHighRepairPo> page) {
+        ListBuildingHighRepairBo bo = new ListBuildingHighRepairBo();
+        if (dto.getMap() != null && dto.getMap().getStatisticalMonth() != null) {
+            bo.setYearMonth(dto.getMap().getStatisticalMonth());
+        }
+        if (dto.getMap() != null && StringUtils.hasText(dto.getMap().getCity()) && !"全省".equals(dto.getMap().getCity())) {
+            bo.setAreaNo(dto.getMap().getCity());
+        }
+        if (dto.getMap() != null && StringUtils.hasText(dto.getMap().getCounty())) {
+            bo.setCityNo(dto.getMap().getCounty());
+        }
+        if (dto.getMap() != null && dto.getMap().getOrder() != null && dto.getMap().getSidx() != null) {
+            if (OrderEnum.asc.equals(dto.getMap().getOrder())) {
+                page.addOrder(OrderItem.asc(dto.getMap().getSidx().getColumnName()));
+            } else {
+                page.addOrder(OrderItem.desc(dto.getMap().getSidx().getColumnName()));
+            }
+        }
+        return houseRepairExceptionDao.listBuildingHighRepair(page, bo);
+    }
+
+    /**
+     * 写高总价统计文件
+     */
+    private void writeQueryHighPrice(ListBuildingHighRepairDto dto, SXSSFWorkbook wb) {
+        Page<HouseBuildingHighRepairPo> page = new Page<>(1, Long.MAX_VALUE);
+        List<HouseBuildingHighRepairPo> list = getHouseBuildingHighRepairPos(dto, page);
+        DataFormat dataFormat = wb.createDataFormat();
+        // 数字样式
+        CellStyle numberCellStyle = wb.createCellStyle();
+        numberCellStyle.setDataFormat(dataFormat.getFormat("#,##0.00"));
+        numberCellStyle.setAlignment(HorizontalAlignment.RIGHT);
+        // 默认样式
+        CellStyle baseCellStyle = wb.createCellStyle();
+        baseCellStyle.setAlignment(HorizontalAlignment.CENTER);
+        baseCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        SXSSFSheet sheet = wb.createSheet();
+        AtomicInteger columnIndex = new AtomicInteger(0);
+        // 表头
+        Row headerRow = sheet.createRow(columnIndex.getAndIncrement());
+        List<String> headers = Stream.of("入账日期", "二级单位", "三级单位", "建筑别名", "维修类型", "维修内容",
+                "erp入账金额元", "标准地址", "建筑用途", "建筑面积㎡", "建筑面积自用㎡", "建筑面积出租㎡", "建筑面积闲置㎡",
+                        "建筑面积不可使用㎡").toList();
+        int headerLength = headers.size();
+        for (int i = 0; i < headerLength; i++) {
+            Cell cell = headerRow.createCell(i);
+            cell.setCellValue(headers.get(i));
+            cell.setCellStyle(baseCellStyle);
+            // 根据内容长度设置列宽
+            int columnWidth = headers.get(i).length() * 256 * 2 + 256;
+            sheet.setColumnWidth(i, columnWidth);
+        }
+        // 数据
+        for (HouseBuildingHighRepairPo houseBuildingHighRepairPo : list) {
+            Row row = sheet.createRow(columnIndex.getAndIncrement());
+            // 入账日期
+            Cell a = row.createCell(CellReference.convertColStringToIndex("a"));
+            if (houseBuildingHighRepairPo.getLatestRepairMonth() != null) {
+                a.setCellValue(houseBuildingHighRepairPo.getLatestRepairMonth());
+            }
+            // 二级单位
+            Cell b = row.createCell(CellReference.convertColStringToIndex("b"));
+            if (houseBuildingHighRepairPo.getAreaName() != null) {
+                b.setCellValue(houseBuildingHighRepairPo.getAreaName());
+            }
+            // 三级单位
+            Cell c = row.createCell(CellReference.convertColStringToIndex("c"));
+            if (houseBuildingHighRepairPo.getCityName() != null) {
+                c.setCellValue(houseBuildingHighRepairPo.getCityName());
+            }
+            // 建筑别名
+            Cell d = row.createCell(CellReference.convertColStringToIndex("d"));
+            if (houseBuildingHighRepairPo.getBuildingName() != null) {
+                d.setCellValue(houseBuildingHighRepairPo.getBuildingName());
+            }
+            // 维修类型
+            Cell e = row.createCell(CellReference.convertColStringToIndex("e"));
+            if (houseBuildingHighRepairPo.getRepairType() != null) {
+                e.setCellValue(houseBuildingHighRepairPo.getRepairType());
+            }
+            // 维修内容
+            Cell f = row.createCell(CellReference.convertColStringToIndex("f"));
+            if (houseBuildingHighRepairPo.getContentCategory() != null) {
+                f.setCellValue(houseBuildingHighRepairPo.getContentCategory());
+            }
+            // erp入账金额元
+            Cell g = row.createCell(CellReference.convertColStringToIndex("g"));
+            if (houseBuildingHighRepairPo.getFinalCostSum() != null) {
+                g.setCellValue(houseBuildingHighRepairPo.getFinalCostSum().doubleValue());
+            }
+            g.setCellStyle(numberCellStyle);
+            // 标准地址
+            Cell h = row.createCell(CellReference.convertColStringToIndex("h"));
+            if (houseBuildingHighRepairPo.getAddress() != null) {
+                h.setCellValue(houseBuildingHighRepairPo.getAddress());
+            }
+            // 建筑用途
+            Cell i = row.createCell(CellReference.convertColStringToIndex("i"));
+            if (houseBuildingHighRepairPo.getBuildingUse() != null) {
+                i.setCellValue(houseBuildingHighRepairPo.getBuildingUse());
+            }
+            // 建筑面积㎡
+            Cell j = row.createCell(CellReference.convertColStringToIndex("j"));
+            if (houseBuildingHighRepairPo.getBuildingArea() != null) {
+                j.setCellValue(houseBuildingHighRepairPo.getBuildingArea().doubleValue());
+            }
+            j.setCellStyle(numberCellStyle);
+            // 建筑面积自用㎡
+            Cell k = row.createCell(CellReference.convertColStringToIndex("k"));
+            if (houseBuildingHighRepairPo.getBuildingAreaSelfUse() != null) {
+                k.setCellValue(houseBuildingHighRepairPo.getBuildingAreaSelfUse().doubleValue());
+            }
+            k.setCellStyle(numberCellStyle);
+            // 建筑面积出租㎡
+            Cell l = row.createCell(CellReference.convertColStringToIndex("l"));
+            if (houseBuildingHighRepairPo.getBuildingAreaRent() != null) {
+                l.setCellValue(houseBuildingHighRepairPo.getBuildingAreaRent().doubleValue());
+            }
+            l.setCellStyle(numberCellStyle);
+            // 建筑面积闲置㎡
+            Cell m = row.createCell(CellReference.convertColStringToIndex("m"));
+            if (houseBuildingHighRepairPo.getBuildingAreaIdle() != null) {
+                m.setCellValue(houseBuildingHighRepairPo.getBuildingAreaIdle().doubleValue());
+            }
+            m.setCellStyle(numberCellStyle);
+            // 建筑面积不可使用㎡
+            Cell n = row.createCell(CellReference.convertColStringToIndex("n"));
+            if (houseBuildingHighRepairPo.getBuildingAreaUnusable() != null) {
+                n.setCellValue(houseBuildingHighRepairPo.getBuildingAreaUnusable().doubleValue());
+            }
+            n.setCellStyle(numberCellStyle);
+        }
+    }
+}

src/main/java/com/example/service/house/HouseWzOtnAreaService.java

@@ -0,0 +1,27 @@
+package com.example.service.house;
+
+import com.example.dao.WzOtnAreaDao;
+import com.example.entity.OtnAreaEntity;
+import com.example.utils.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class HouseWzOtnAreaService {
+    private final WzOtnAreaDao wzOtnAreaDao;
+
+    public HouseWzOtnAreaService(WzOtnAreaDao wzOtnAreaDao) {
+        this.wzOtnAreaDao = wzOtnAreaDao;
+    }
+
+    public R getCityOption(String id) {
+        if ("0".equals(id)) {
+            id = "018";
+        }
+        List<OtnAreaEntity> list = wzOtnAreaDao.listByParentId(id);
+        return R.ok().put("list", list);
+    }
+}

src/main/java/com/example/service/impl/WzBuildManageDetailsServiceImpl.java

@@ -28,7 +28,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
     @Override
     public List<WzBuildManageDetailsEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -38,7 +38,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -67,7 +67,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
     @Override
     public int queryTotal(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -77,7 +77,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -99,7 +99,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
     @Override
     public List<LeaveUseVo> queryLeaveUseList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -109,7 +109,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -132,7 +132,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
     @Override
     public List<LeaveUseVo> queryLeaveUseByEchart(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -142,7 +142,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -357,7 +357,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList = otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList = otnAreaService.getCityOption("018");
         List<LeaveUseVo> orderList = new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {
@@ -451,7 +451,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
 
     public void dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -461,7 +461,7 @@ public class WzBuildManageDetailsServiceImpl implements WzBuildManageDetailsServ
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzBuildmanageAvageareaServiceImpl.java

@@ -23,7 +23,7 @@ public class WzBuildmanageAvageareaServiceImpl implements WzBuildmanageAvagearea
     @Override
     public List<WzBuildmanageAvageareaEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -33,7 +33,7 @@ public class WzBuildmanageAvageareaServiceImpl implements WzBuildmanageAvagearea
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -48,7 +48,7 @@ public class WzBuildmanageAvageareaServiceImpl implements WzBuildmanageAvagearea
     @Override
     public List<WzBuildmanageAvageareaVo> queryVoList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -58,7 +58,7 @@ public class WzBuildmanageAvageareaServiceImpl implements WzBuildmanageAvagearea
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzDataInspectionServiceImpl.java

@@ -33,7 +33,7 @@ public class WzDataInspectionServiceImpl implements WzDataInspectionService {
 
     public void dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){

src/main/java/com/example/service/impl/WzHouseArrearsManageServiceImpl.java

@@ -22,7 +22,7 @@ public class WzHouseArrearsManageServiceImpl implements WzHouseArrearsManageServ
     @Override
     public List<WzHouseArrearsManageEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -32,7 +32,7 @@ public class WzHouseArrearsManageServiceImpl implements WzHouseArrearsManageServ
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -54,7 +54,7 @@ public class WzHouseArrearsManageServiceImpl implements WzHouseArrearsManageServ
     @Override
     public int queryTotal(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -64,7 +64,7 @@ public class WzHouseArrearsManageServiceImpl implements WzHouseArrearsManageServ
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseContracServiceImpl.java

@@ -173,7 +173,7 @@ public class WzHouseContracServiceImpl implements WzHouseContracService {
 
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzHouseContracEntity> orderList=new ArrayList<>();
         int i=0;
         for (OtnAreaEntity otnAreaEntity : areaList) {
@@ -219,7 +219,7 @@ public class WzHouseContracServiceImpl implements WzHouseContracService {
 
     public void dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -229,7 +229,7 @@ public class WzHouseContracServiceImpl implements WzHouseContracService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseContractCompareServiceImpl.java

@@ -23,7 +23,7 @@ public class WzHouseContractCompareServiceImpl implements WzHouseContractCompare
     @Override
     public List<WzHouseContractCompareEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -33,7 +33,7 @@ public class WzHouseContractCompareServiceImpl implements WzHouseContractCompare
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -53,7 +53,7 @@ public class WzHouseContractCompareServiceImpl implements WzHouseContractCompare
     @Override
     public int queryTotal(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -63,7 +63,7 @@ public class WzHouseContractCompareServiceImpl implements WzHouseContractCompare
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseContractInServiceImpl.java

@@ -23,7 +23,7 @@ public class WzHouseContractInServiceImpl implements WzHouseContractInService {
     @Override
     public List<WzHouseContractInEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -33,7 +33,7 @@ public class WzHouseContractInServiceImpl implements WzHouseContractInService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -53,7 +53,7 @@ public class WzHouseContractInServiceImpl implements WzHouseContractInService {
     @Override
     public int queryTotal(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -63,7 +63,7 @@ public class WzHouseContractInServiceImpl implements WzHouseContractInService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseContractOutServiceImpl.java

@@ -34,7 +34,7 @@ public class WzHouseContractOutServiceImpl implements WzHouseContractOutService
 
     public void deal(Map<String,Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -44,7 +44,7 @@ public class WzHouseContractOutServiceImpl implements WzHouseContractOutService
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseContractTopServiceImpl.java

@@ -23,7 +23,7 @@ public class WzHouseContractTopServiceImpl implements WzHouseContractTopService
     @Override
     public List<WzHouseContractTopEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -33,7 +33,7 @@ public class WzHouseContractTopServiceImpl implements WzHouseContractTopService
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -53,7 +53,7 @@ public class WzHouseContractTopServiceImpl implements WzHouseContractTopService
     @Override
     public int queryTotal(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -63,7 +63,7 @@ public class WzHouseContractTopServiceImpl implements WzHouseContractTopService
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseCustomerServiceImpl.java

@@ -32,7 +32,7 @@ public class WzHouseCustomerServiceImpl implements WzHouseCustomerService {
 
     public void  dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -42,7 +42,7 @@ public class WzHouseCustomerServiceImpl implements WzHouseCustomerService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseInCustomerServiceImpl.java

@@ -27,7 +27,7 @@ public class WzHouseInCustomerServiceImpl implements WzHouseInCustomerService {
 
     public void  dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -37,7 +37,7 @@ public class WzHouseInCustomerServiceImpl implements WzHouseInCustomerService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseLeaseInConServiceImpl.java

@@ -34,7 +34,7 @@ public class WzHouseLeaseInConServiceImpl implements WzHouseLeaseInConService {
 
     public void dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -44,7 +44,7 @@ public class WzHouseLeaseInConServiceImpl implements WzHouseLeaseInConService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseMaintServiceImpl.java

@@ -34,7 +34,7 @@ public class WzHouseMaintServiceImpl implements WzHouseMaintService {
 
     public void dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -44,7 +44,7 @@ public class WzHouseMaintServiceImpl implements WzHouseMaintService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseMaintenaCostServiceImpl.java

@@ -91,7 +91,7 @@ public class WzHouseMaintenaCostServiceImpl implements WzHouseMaintenaCostServic
         }
 
         //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption(0l);
+        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
         List<WzScoreVo> orderList=new ArrayList<>();
         int highNum=0;
         int dailyNum=0;
@@ -187,7 +187,7 @@ public class WzHouseMaintenaCostServiceImpl implements WzHouseMaintenaCostServic
 
     public void  dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -200,7 +200,7 @@ public class WzHouseMaintenaCostServiceImpl implements WzHouseMaintenaCostServic
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzHouseUseServiceImpl.java

@@ -34,7 +34,7 @@ public class WzHouseUseServiceImpl implements WzHouseUseService {
 
     public void dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -44,7 +44,7 @@ public class WzHouseUseServiceImpl implements WzHouseUseService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzLandManageDetailsServiceImpl.java

@@ -24,7 +24,7 @@ public class WzLandManageDetailsServiceImpl implements WzLandManageDetailsServic
     @Override
     public List<WzLandManageDetailsEntity> queryList(Map<String, Object> map) {
         if (map.get("city") != null && !map.get("city").toString().equals("全省") && !map.get("city").toString().equals("")) {
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city", city.getName());
         }
         if (map.get("city") != null && map.get("city").toString().equals("全省")) {
@@ -34,7 +34,7 @@ public class WzLandManageDetailsServiceImpl implements WzLandManageDetailsServic
             map.remove("city");
         }
         if (map.get("county") != null && !map.get("county").toString().equals("区县") && !map.get("county").toString().equals("")) {
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county", city.getName());
         }
         if (map.get("county") != null && map.get("county").toString().equals("区县")) {
@@ -56,7 +56,7 @@ public class WzLandManageDetailsServiceImpl implements WzLandManageDetailsServic
     @Override
     public int queryTotal(Map<String, Object> map) {
         if (map.get("city") != null && !map.get("city").toString().equals("全省") && !map.get("city").toString().equals("")) {
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city", city.getName());
         }
         if (map.get("city") != null && map.get("city").toString().equals("全省")) {
@@ -66,7 +66,7 @@ public class WzLandManageDetailsServiceImpl implements WzLandManageDetailsServic
             map.remove("city");
         }
         if (map.get("county") != null && !map.get("county").toString().equals("区县") && !map.get("county").toString().equals("")) {
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county", city.getName());
         }
         if (map.get("county") != null && map.get("county").toString().equals("区县")) {
@@ -88,7 +88,7 @@ public class WzLandManageDetailsServiceImpl implements WzLandManageDetailsServic
     @Override
     public List<FloorNoUserVo> queryLeaveUseList(Map<String, Object> map) {
         if (map.get("city") != null && !map.get("city").toString().equals("全省") && !map.get("city").toString().equals("")) {
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city", city.getName());
         }
         if (map.get("city") != null && map.get("city").toString().equals("全省")) {
@@ -98,7 +98,7 @@ public class WzLandManageDetailsServiceImpl implements WzLandManageDetailsServic
             map.remove("city");
         }
         if (map.get("county") != null && !map.get("county").toString().equals("区县") && !map.get("county").toString().equals("")) {
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county", city.getName());
         }
         if (map.get("county") != null && map.get("county").toString().equals("区县")) {
@@ -120,7 +120,7 @@ public class WzLandManageDetailsServiceImpl implements WzLandManageDetailsServic
 
     public void dealMap(Map<String, Object> map) {
         if (map.get("city") != null && !map.get("city").toString().equals("全省") && !map.get("city").toString().equals("")) {
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city", city.getName());
         }
         if (map.get("city") != null && map.get("city").toString().equals("全省")) {
@@ -130,7 +130,7 @@ public class WzLandManageDetailsServiceImpl implements WzLandManageDetailsServic
             map.remove("city");
         }
         if (map.get("county") != null && !map.get("county").toString().equals("区县") && !map.get("county").toString().equals("")) {
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county", city.getName());
         }
         if (map.get("county") != null && map.get("county").toString().equals("区县")) {

src/main/java/com/example/service/impl/WzLowestUnitPriceServiceImpl.java

@@ -23,7 +23,7 @@ public class WzLowestUnitPriceServiceImpl implements WzLowestUnitPriceService {
     @Override
     public List<WzLowestUnitPriceEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -33,7 +33,7 @@ public class WzLowestUnitPriceServiceImpl implements WzLowestUnitPriceService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -53,7 +53,7 @@ public class WzLowestUnitPriceServiceImpl implements WzLowestUnitPriceService {
     @Override
     public int queryTotal(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -63,7 +63,7 @@ public class WzLowestUnitPriceServiceImpl implements WzLowestUnitPriceService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzOtnAreaServiceImpl.java

@@ -31,18 +31,18 @@ public class WzOtnAreaServiceImpl implements WzOtnAreaService {
     }
 
     @Override
-    public List<OtnAreaEntity> getCityOption(Long parentId) {
-        return wzOtnAreaDao.getCityOption(parentId);
+    public List<OtnAreaEntity> getCityOption(String parentId) {
+        return wzOtnAreaDao.listByParentId(parentId);
     }
 
     @Override
     public OtnAreaEntity queryObject(String city) {
-        return wzOtnAreaDao.queryObject(city);
+        return wzOtnAreaDao.getByName(city);
     }
 
     @Override
-    public OtnAreaEntity queryObjectById(Long city) {
-        return wzOtnAreaDao.queryObjectById(city);
+    public OtnAreaEntity queryObjectById(String city) {
+        return wzOtnAreaDao.getById(city);
     }
 
 }

src/main/java/com/example/service/impl/WzRentHouseArrearServiceImpl.java

@@ -39,7 +39,7 @@ public class WzRentHouseArrearServiceImpl implements WzRentHouseArrearsService {
 
     public void  dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -49,7 +49,7 @@ public class WzRentHouseArrearServiceImpl implements WzRentHouseArrearsService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzRentThreeMonthServiceImpl.java

@@ -40,7 +40,7 @@ public class WzRentThreeMonthServiceImpl implements WzRentThreeMonthService {
 
     public void  dealMap(Map<String, Object> map){
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -50,7 +50,7 @@ public class WzRentThreeMonthServiceImpl implements WzRentThreeMonthService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzScoreRankingServiceImpl.java

@@ -23,7 +23,7 @@ public class WzScoreRankingServiceImpl implements WzScoreRankingService {
     @Override
     public List<WzScoreRankingEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -33,7 +33,7 @@ public class WzScoreRankingServiceImpl implements WzScoreRankingService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -53,7 +53,7 @@ public class WzScoreRankingServiceImpl implements WzScoreRankingService {
     @Override
     public int queryTotal(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -63,7 +63,7 @@ public class WzScoreRankingServiceImpl implements WzScoreRankingService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzStrategyServiceImpl.java

@@ -23,7 +23,7 @@ public class WzStrategyServiceImpl implements WzStrategyService {
     @Override
     public List<WzStrategyEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -33,7 +33,7 @@ public class WzStrategyServiceImpl implements WzStrategyService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -48,7 +48,7 @@ public class WzStrategyServiceImpl implements WzStrategyService {
     @Override
     public int queryTotal(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -58,7 +58,7 @@ public class WzStrategyServiceImpl implements WzStrategyService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){

src/main/java/com/example/service/impl/WzUserServiceImpl.java

@@ -23,7 +23,7 @@ public class WzUserServiceImpl implements WzUserService {
     @Override
     public List<WzUserEntity> queryList(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -33,7 +33,7 @@ public class WzUserServiceImpl implements WzUserService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -48,7 +48,7 @@ public class WzUserServiceImpl implements WzUserService {
     @Override
     public int queryTotal(Map<String, Object> map) {
         if(map.get("city")!=null&&!map.get("city").toString().equals("全省")&&!map.get("city").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("city").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("city").toString());
             map.put("city",city.getName());
         }
         if(map.get("city")!=null&&map.get("city").toString().equals("全省")){
@@ -58,7 +58,7 @@ public class WzUserServiceImpl implements WzUserService {
             map.remove("city");
         }
         if(map.get("county")!=null&&!map.get("county").toString().equals("区县")&&!map.get("county").toString().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(map.get("county").toString()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(map.get("county").toString());
             map.put("county",city.getName());
         }
         if(map.get("county")!=null&&map.get("county").toString().equals("区县")){
@@ -73,11 +73,11 @@ public class WzUserServiceImpl implements WzUserService {
     @Override
     public int save(WzUserEntity userEntity) {
         if(userEntity.getCity()!=null&&!userEntity.getCity().equals("全省")&&!userEntity.getCity().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(userEntity.getCity()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(userEntity.getCity());
             userEntity.setCity(city.getName());
         }
         if(userEntity.getCounty()!=null&&!userEntity.getCounty().equals("区县")&&!userEntity.getCounty().equals("")){
-            OtnAreaEntity city = otnAreaService.queryObjectById(Long.parseLong(userEntity.getCounty()));
+            OtnAreaEntity city = otnAreaService.queryObjectById(userEntity.getCounty());
             userEntity.setCounty(city.getName());
         }
         return wzUserDao.save(userEntity);

src/main/java/com/example/utils/PageUtils.java

@@ -1,6 +1,8 @@
 package com.example.utils;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -12,19 +14,28 @@ import java.util.List;
  * @email 1600148841@qq.com
  * @date 2019/10/14
  */
+@Data
 public class PageUtils implements Serializable {
     private static final long serialVersionUID = 1L;
     //总记录数
-    private int totalCount;
+    private Long totalCount;
     //每页记录数
-    private int pageSize;
+    private Long pageSize;
     //总页数
-    private int totalPage;
+    private Long totalPage;
     //当前页数
-    private int currPage;
+    private Long currPage;
     //列表数据
     private List<?> list;
 
+    public PageUtils(List<?> list, Page page) {
+        this.list = list;
+        this.totalCount = page.getTotal();
+        this.pageSize = page.getSize();
+        this.currPage = page.getCurrent();
+        this.totalPage = page.getPages();
+    }
+
     /**
      * 分页
      *
@@ -35,58 +46,17 @@ public class PageUtils implements Serializable {
      */
     public PageUtils(List<?> list, int totalCount, int pageSize, int currPage) {
         this.list = list;
-        this.totalCount = totalCount;
-        this.pageSize = pageSize;
-        this.currPage = currPage;
-        this.totalPage = (int) Math.ceil((double) totalCount / pageSize);
+        this.totalCount = (long) totalCount;
+        this.pageSize = (long) pageSize;
+        this.currPage = (long) currPage;
+        this.totalPage = (long) Math.ceil((double) totalCount / pageSize);
     }
 
     public PageUtils(PageInfo pageInfo) {
         this.list = pageInfo.getList();
-        this.totalCount = (int) pageInfo.getTotal();
-        this.pageSize = pageInfo.getPageSize();
-        this.currPage = pageInfo.getPageNum();
-        this.totalPage = pageInfo.getPages();
-    }
-
-    public int getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(int totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public int getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(int pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public int getTotalPage() {
-        return totalPage;
+        this.totalCount =  pageInfo.getTotal();
+        this.pageSize = (long) pageInfo.getPageSize();
+        this.currPage = (long) pageInfo.getPageNum();
+        this.totalPage = (long) pageInfo.getPages();
     }
-
-    public void setTotalPage(int totalPage) {
-        this.totalPage = totalPage;
-    }
-
-    public int getCurrPage() {
-        return currPage;
-    }
-
-    public void setCurrPage(int currPage) {
-        this.currPage = currPage;
-    }
-
-    public List<?> getList() {
-        return list;
-    }
-
-    public void setList(List<?> list) {
-        this.list = list;
-    }
-
 }

src/main/java/com/example/utils/R.java

@@ -14,6 +14,7 @@ public class R extends HashMap<String, Object> {
     private static final long serialVersionUID = 1L;
 
     public R() {
+        put("success", true);
         put("code", 0);
     }
 
@@ -27,6 +28,7 @@ public class R extends HashMap<String, Object> {
 
     public static R error(int code, String msg) {
         R r = new R();
+        r.put("success", false);
         r.put("code", code);
         r.put("message", msg);
         return r;
@@ -34,7 +36,9 @@ public class R extends HashMap<String, Object> {
 
     public static R ok(String msg) {
         R r = new R();
-        r.put("msg", msg);
+        r.put("success", true);
+        r.put("code", 0);
+        r.put("message", msg);
         return r;
     }
 

src/main/resources/com/example/dao/WzHouseMaintenaCostDao.xml

@@ -199,7 +199,7 @@
             AND use_area_rent_area =  #{useAreaRentArea}
         </if>
         <if test="statisticalMonth != null ">
-            AND statistical_month = #{statisticalMonth}
+            AND statistical_month >= #{statisticalMonth}
         </if>
         <if test="statisticalMonth1 != null ">
             AND statistical_month &lt;= #{statisticalMonth1}