fix: 修复不动产房屋租入相关接口错误

.mvn/maven.config

@@ -0,0 +1,4 @@
+-U
+-T1C
+-Dmaven.test.skip=true
+-Dmaven.compile.fork=true

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

@@ -3,6 +3,7 @@ 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 com.example.config.mybatis.DescNullsLastInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -17,6 +18,7 @@ public class MybatisPlusConfig {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         // 添加分页拦截器
         interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
+        interceptor.addInnerInterceptor(new DescNullsLastInterceptor());
         return interceptor;
     }
 }

src/main/java/com/example/config/mybatis/DescNullsLastInterceptor.java

@@ -0,0 +1,23 @@
+package com.example.config.mybatis;
+
+import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
+import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+
+public class DescNullsLastInterceptor implements InnerInterceptor {
+    @Override
+    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds,
+                            ResultHandler resultHandler, BoundSql boundSql) {
+        String sql = boundSql.getSql();
+        if (!StringUtils.containsIgnoreCase(sql, "desc")) {
+            return;
+        }
+        String sqlNew = sql.replaceAll("(?i)(\\bdesc\\b(?!\\s+nulls\\s+last\\b))(?=[^a-z]|$)", "$1 nulls last");
+        PluginUtils.mpBoundSql(boundSql).sql(sqlNew);
+    }
+}

src/main/java/com/example/config/web/MyDispatcherServlet.java

@@ -26,6 +26,11 @@ public class MyDispatcherServlet extends DispatcherServlet {
             "/house-car/house/dist/api/wzHouseMaintenaCost/buildingIdleRepairExport",
             "/house-car/house/dist/api/wzHouseMaintenaCost/buildingRepairStatExport",
             "/house-car/house/dist/api/wzHouseMaintenaCost/listBuildingRepairMonthExport",
+            "/house-car/house/dist/api/WzHouseLeaseInCon/rentInContractStatExport",
+            "/house-car/house/dist/api/WzHouseContractIn/listRentInContractExport",
+            "/house-car/house/dist/api/WzHouseUse/rentInUseStatExport",
+            "/house-car/house/dist/api/WzHouseContractTop/listRentInTopExport",
+            "/house-car/house/dist/api/WzHouseContractCompare/listRentInCompareExport",
             "/house-car/house/dist/api/siteStat/siteStatExport",
             "/house-car/house/dist/api/WzBuildmanageAvagearea/buildingOfficeAreaStatExport",
             "/house-car/house/dist/api/WzBuildManageDetails/excel",

src/main/java/com/example/config/web/RequestLogHandlerInterceptor.java

@@ -1,6 +1,6 @@
 package com.example.config.web;
 
-import com.example.entity.common.RequestLogPo;
+import com.example.pojo.po.common.RequestLogPo;
 import com.example.service.common.RequestLogService;
 import com.example.utils.AESUtil;
 import com.example.utils.R;

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

@@ -1,360 +0,0 @@
-package com.example.controller;
-
-import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseUseEntity;
-import com.example.entity.vo.WzHouseUseVo;
-import com.example.service.WzHouseUseService;
-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 com.example.utils.excel.ExcelExport;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 房屋租入（租入用途管理）
- */
-@RestController
-@RequestMapping("/house-car/house/dist/api/WzHouseUse")
-public class WzHouseUseController {
-
-    @Autowired
-    private WzHouseUseService wzHouseUseService;
-    @Autowired
-    private WzOtnAreaService otnAreaService;
-
-    @RequestMapping("/list")
-    @IgnoreAuth
-    public R list(@RequestBody PageMap pageMap) {
-        //查询列表数据
-        Query query = new Query(pageMap);
-        List<WzHouseUseEntity> list = wzHouseUseService.queryList(pageMap.getMap());
-        int total = wzHouseUseService.queryTotal(query);
-        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
-        return R.ok().put("page", pageUtil);
-    }
-
-    @RequestMapping("/echartList")
-    @IgnoreAuth
-    public R echartList(@RequestBody PageMap pageMap) {
-        //查询列表数据
-        Query query = new Query(pageMap);
-        List<WzHouseUseEntity> wzHouseContracEntityList = wzHouseUseService.queryList(pageMap.getMap());
-
-        Map<String,List<WzHouseUseEntity>> cityMap=new HashMap<>();
-        for (WzHouseUseEntity leaveUseVo : wzHouseContracEntityList) {
-            List<WzHouseUseEntity> list;
-            if(cityMap.get(leaveUseVo.getCity())!=null){
-                list=cityMap.get(leaveUseVo.getCity());
-                list.add(leaveUseVo);
-            }else{
-                list=new ArrayList<>();
-                list.add(leaveUseVo);
-            }
-            cityMap.put(leaveUseVo.getCity(),list);
-        }
-
-        List<WzHouseUseVo> resultList=new ArrayList<>();
-        List<WzHouseUseVo> cityList=new ArrayList<>();
-
-        int allyingYe=0;
-        int allbanGong=0;
-        int alltongXin=0;
-        int allother=0;
-        int allall=0;
-        for(Map.Entry<String,List<WzHouseUseEntity>> entry:cityMap.entrySet()){
-            List<WzHouseUseEntity> list=entry.getValue();
-
-            if (list.get(0).getCounty().equals("全省")) {
-                continue;
-            }
-            //县的Map集合
-            Map<String, List<WzHouseUseEntity>> countyMap = new HashMap<>();
-            for (WzHouseUseEntity leaveUseVo : list) {
-                if (leaveUseVo.getCounty() == null || leaveUseVo.getCounty().equals("")) {
-                    continue;
-                }
-                if (countyMap.get(leaveUseVo.getCounty()) != null) {
-                    list = countyMap.get(leaveUseVo.getCounty());
-                    list.add(leaveUseVo);
-                } else {
-                    list = new ArrayList<>();
-                    list.add(leaveUseVo);
-                }
-                countyMap.put(leaveUseVo.getCounty(), list);
-            }
-
-            int cityyingYe=0;
-            int citybanGong=0;
-            int citytongXin=0;
-            int cityother=0;
-            int cityall=0;
-            List<WzHouseUseVo> countyList=new ArrayList<>();
-            for (Map.Entry<String, List<WzHouseUseEntity>> countyEntry : countyMap.entrySet()) {
-                int yingYe=0;
-                int banGong=0;
-                int tongXin=0;
-                int other=0;
-                int all=0;
-                for (WzHouseUseEntity leaveUseVo : countyEntry.getValue()) {
-                    if(leaveUseVo.getRentalUse()!=null){
-                        if(leaveUseVo.getRentalUse().equals("通信设施机房")){
-                            tongXin+=1;
-                            citytongXin+=1;
-                            alltongXin+=1;
-                        }
-                        else if(leaveUseVo.getRentalUse().equals("营业")){
-                            yingYe+=1;
-                            cityyingYe+=1;
-                            allyingYe+=1;
-                        }
-                        else if(leaveUseVo.getRentalUse().equals("其他租入用途")){
-                            other+=1;
-                            cityother+=1;
-                            allother+=1;
-                        }
-                        else if(leaveUseVo.getRentalUse().equals("办公")){
-                            banGong+=1;
-                            citybanGong+=1;
-                            allbanGong+=1;
-                        }
-                        all+=1;
-                        cityall+=1;
-                        allall+=1;
-                    }
-                }
-                WzHouseUseVo wzHouseInCustomerEntity = new WzHouseUseVo();
-                wzHouseInCustomerEntity.setYingYe(yingYe);
-                wzHouseInCustomerEntity.setCity(countyEntry.getKey());
-                wzHouseInCustomerEntity.setBanGong(banGong);
-                wzHouseInCustomerEntity.setAll(all);
-                wzHouseInCustomerEntity.setTongXin(tongXin);
-                wzHouseInCustomerEntity.setOther(other);
-                countyList.add(wzHouseInCustomerEntity);
-            }
-            List<WzHouseUseVo> orderCountyList=new ArrayList<>();
-            try{
-                //对countList 进行排序
-                String city=list.get(0).getCity();
-                if(city.contains("市")){
-                    city=city.split("市")[0];
-                }
-                OtnAreaEntity area=otnAreaService.queryObject(city);
-                List<OtnAreaEntity> countyAreaList=otnAreaService.getCityOption(area.getId());
-                int i=0;
-                for (OtnAreaEntity otnAreaEntity : countyAreaList) {
-                    for (WzHouseUseVo wzCity : countyList) {
-                        if(wzCity.getCity().contains(otnAreaEntity.getName())){
-                            i++;
-                            wzCity.setFlag(i%2==0);
-                            orderCountyList.add(wzCity);
-                        }
-                    }
-                }
-            }catch (Exception e){
-                orderCountyList=countyList;
-                e.printStackTrace();
-            }
-
-            WzHouseUseVo wzHouseInCustomerEntity = new WzHouseUseVo();
-            wzHouseInCustomerEntity.setCity(entry.getKey());
-            wzHouseInCustomerEntity.setYingYe(cityyingYe);
-            wzHouseInCustomerEntity.setBanGong(citybanGong);
-            wzHouseInCustomerEntity.setAll(cityall);
-            wzHouseInCustomerEntity.setTongXin(citytongXin);
-            wzHouseInCustomerEntity.setOther(cityother);
-            wzHouseInCustomerEntity.setChildren(orderCountyList);
-            cityList.add(wzHouseInCustomerEntity);
-        }
-
-
-        //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
-        List<WzHouseUseVo> orderList=new ArrayList<>();
-        int i=0;
-        for (OtnAreaEntity otnAreaEntity : areaList) {
-            for (WzHouseUseVo wzCity : cityList) {
-                if(wzCity.getCity().contains(otnAreaEntity.getName())){
-                    wzCity.setFlag(i%2==0);
-                    i++;
-                    orderList.add(wzCity);
-                }
-            }
-        }
-
-        WzHouseUseVo province=new WzHouseUseVo();
-        province.setCity("全省");
-        province.setYingYe(allyingYe);
-        province.setBanGong(allbanGong);
-        province.setAll(allall);
-        province.setTongXin(alltongXin);
-        province.setOther(allother);
-        province.setChildren(orderList);
-        if(orderList.size()>0){
-            resultList.add(province);
-        }
-        int total = wzHouseUseService.queryTotal(query);
-        PageUtils pageUtil = new PageUtils(resultList, total, query.getLimit(), query.getPage());
-        return R.ok().put("page", pageUtil);
-    }
-
-    /**
-     * 清单excel
-     */
-    @GetMapping("/excel")
-    @IgnoreAuth
-    public void excel(String name,String buildingNameAlias,String city,String county, HttpServletResponse response) {
-        Map<String,Object> map1=new HashMap<>();
-        if(buildingNameAlias!=null){
-            map1.put("buildingNameAlias",buildingNameAlias);
-        }
-        if(city!=null){
-            map1.put("city",city);
-        }
-        if(county!=null){
-            map1.put("county",county);
-        }
-
-        DateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
-        ExcelExport ee1 = new ExcelExport("报表" + df.format(new Date()));
-
-        //判定是闲置管理还是记录
-        if(name.contains("出租合同统计")){
-//            responseTab1(df,ee1,map1);
-            ee1.export(response);
-        }else if(name.contains("出租合同记录")){
-            responseTab2(df,ee1,map1);
-            ee1.export(response);
-        }
-
-
-    }
-
-//    public void responseTab1(DateFormat df, ExcelExport ee1, Map<String, Object> map1){
-//        List<WzHouseUseEntity> wzHouseContracEntityList = wzHouseUseService.queryList(map1);
-//
-//        WzHouseContracEntity province=new WzHouseContracEntity();
-//        province.setCity("全省");
-//
-//        Map<String,List<WzHouseUseEntity>> map=new HashMap<>();
-//        for (WzHouseUseEntity leaveUseVo : wzHouseContracEntityList) {
-//            List<WzHouseUseEntity> list;
-//            if(map.get(leaveUseVo.getCity())!=null){
-//                list=map.get(leaveUseVo.getCity());
-//                list.add(leaveUseVo);
-//            }else{
-//                list=new ArrayList<>();
-//                list.add(leaveUseVo);
-//            }
-//            map.put(leaveUseVo.getCity(),list);
-//        }
-//        List<WzHouseContracEntity> resultList=new ArrayList<>();
-//        List<WzHouseContracEntity> cityList=new ArrayList<>();
-//
-//        double allContractQuantity=0l;
-//        double allNoTaxContractAmount=0l;
-//        double allRentArea=0l;
-//        double allUnitPricePerSquareMeter=0l;
-//
-//        for(Map.Entry<String,List<WzHouseUseEntity>> entry:map.entrySet()){
-//            List<WzHouseUseEntity> list=entry.getValue();
-//            double contractQuantity=0l;
-//            double noTaxContractAmount=0l;
-//            double rentArea=0l;
-//            double unitPricePerSquareMeter=0l;
-//            for (WzHouseUseEntity leaveUseVo : list) {
-//                contractQuantity+=leaveUseVo.getContractQuantity();
-//                noTaxContractAmount+=leaveUseVo.getNoTaxContractAmount();
-//                rentArea+=leaveUseVo.getRentArea();
-//                unitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
-//
-//                allContractQuantity+=leaveUseVo.getContractQuantity();
-//                allNoTaxContractAmount+=leaveUseVo.getNoTaxContractAmount();
-//                allRentArea+=leaveUseVo.getRentArea();
-//                allUnitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
-//            }
-//            cityList.add(list.get(0));
-//        }
-//        province.setContractQuantity(allContractQuantity);
-//        province.setNoTaxContractAmount(formatDouble(allNoTaxContractAmount));
-//        province.setRentArea(allRentArea);
-//        province.setUnitPricePerSquareMeter(formatDouble(allUnitPricePerSquareMeter));
-//        province.setChildren(cityList);
-//        resultList.add(province);
-//
-//
-//        List<Object> colList=new ArrayList();;
-//        List<Object[]> allList = new ArrayList();
-//        for (int i = 0; i < resultList.size(); i++) {
-//
-//            if(resultList.get(i).getCity().contains("省")){
-//                colList = new ArrayList();
-//                colList.add(resultList.get(i).getCity());
-//                colList.add("");
-//                colList.add(resultList.get(i).getContractQuantity());
-//                colList.add(resultList.get(i).getNoTaxContractAmount());
-//                colList.add(resultList.get(i).getRentArea());
-//                colList.add(resultList.get(i).getUnitPricePerSquareMeter());
-//                allList.add(colList.toArray());
-//
-//                //处理城市的
-//                List<WzHouseContracEntity> cityList1=resultList.get(i).getChildren();
-//                for (WzHouseContracEntity floorNoUserVo : cityList1) {
-//                    colList = new ArrayList();
-//                    colList.add("");
-//                    colList.add(floorNoUserVo.getCity());
-//                    colList.add(floorNoUserVo.getContractQuantity());
-//                    colList.add(floorNoUserVo.getNoTaxContractAmount());
-//                    colList.add(floorNoUserVo.getRentArea());
-//                    colList.add(resultList.get(i).getUnitPricePerSquareMeter());
-//                    allList.add(colList.toArray());
-//                }
-//            }
-//        }
-//        String[] header = new String[]{
-//                "资产所属单位(一级)",
-//                "资产所属单位(二级)",
-//                "合同数量",
-//                "不含税合同额(元)",
-//                "出租面积(平米)",
-//                "每平米单价(元)"
-//        };
-//        ee1.addSheetByArray(df.format(new Date()) + "清单", allList, header);
-//    }
-
-    public void responseTab2(DateFormat df, ExcelExport ee1, Map<String, Object> map1){
-
-
-
-
-    }
-
-    public double formatDouble(double num){
-        double avera=0l;
-        try{
-            DecimalFormat format2 = new DecimalFormat("#.00");
-            String str2 = format2.format(num);
-            avera = Double.parseDouble(str2);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return avera;
-    }
-
-}

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

@@ -1,20 +1,20 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 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.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.dao.gdc.WzHouseMaintenaCostDao;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzBuildManageDetailsEntity;
+import com.example.pojo.gdc.WzHouseMaintenaCostEntity;
+import com.example.pojo.gdc.vo.BuildManageVo;
+import com.example.pojo.gdc.vo.housemanager.HouseYearVo;
+import com.example.pojo.gdc.vo.housemanager.LeaveUseVo;
+import com.example.pojo.gdc.vo.housemanager.WzBuildmanageAvageareaVo;
 import com.example.pojo.vo.HouseStaticVo;
-import com.example.service.WzBuildManageDetailsService;
-import com.example.service.WzBuildmanageAvageareaService;
-import com.example.service.WzHouseMaintenaCostService;
-import com.example.service.WzOtnAreaService;
-import com.example.service.WzStrategyService;
+import com.example.service.gdc.WzBuildManageDetailsService;
+import com.example.service.gdc.WzBuildmanageAvageareaService;
+import com.example.service.gdc.WzHouseMaintenaCostService;
+import com.example.service.gdc.WzOtnAreaService;
+import com.example.service.gdc.WzStrategyService;
 import com.example.utils.PageMap;
 import com.example.utils.Query;
 import com.example.utils.R;

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

@@ -3,8 +3,8 @@
 //import com.example.config.annotation.IgnoreAuth;
 //import com.example.entity.OtnAreaEntity;
 //import com.example.entity.vo.housemanager.WzBuildmanageAvageareaVo;
-//import com.example.service.WzBuildmanageAvageareaService;
-//import com.example.service.WzOtnAreaService;
+//import com.example.service.gdc.WzBuildmanageAvageareaService;
+//import com.example.service.gdc.WzOtnAreaService;
 //import com.example.utils.PageMap;
 //import com.example.utils.PageUtils;
 //import com.example.utils.Query;

src/main/java/com/example/controller/WzDataInspectionController.java → src/main/java/com/example/controller/gdc/WzDataInspectionController.java

@@ -1,8 +1,8 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.WzDataInspectionEntity;
-import com.example.service.WzDataInspectionService;
+import com.example.pojo.gdc.WzDataInspectionEntity;
+import com.example.service.gdc.WzDataInspectionService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -1,10 +1,10 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseArrearsManageEntity;
-import com.example.service.WzHouseArrearsManageService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseArrearsManageEntity;
+import com.example.service.gdc.WzHouseArrearsManageService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -1,18 +1,18 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseArrearsManageEntity;
-import com.example.entity.WzHouseContracEntity;
-import com.example.entity.WzHouseContractOutEntity;
-import com.example.entity.WzHouseCustomerEntity;
-import com.example.entity.WzHouseMarketEntity;
-import com.example.service.WzHouseArrearsManageService;
-import com.example.service.WzHouseContracService;
-import com.example.service.WzHouseContractOutService;
-import com.example.service.WzHouseCustomerService;
-import com.example.service.WzHouseMarketService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseArrearsManageEntity;
+import com.example.pojo.gdc.WzHouseContracEntity;
+import com.example.pojo.gdc.WzHouseContractOutEntity;
+import com.example.pojo.gdc.WzHouseCustomerEntity;
+import com.example.pojo.gdc.WzHouseMarketEntity;
+import com.example.service.gdc.WzHouseArrearsManageService;
+import com.example.service.gdc.WzHouseContracService;
+import com.example.service.gdc.WzHouseContractOutService;
+import com.example.service.gdc.WzHouseCustomerService;
+import com.example.service.gdc.WzHouseMarketService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -1,12 +1,11 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseContractCompareEntity;
-import com.example.entity.WzHouseContractInEntity;
-import com.example.entity.vo.contract.RentInVo;
-import com.example.service.WzHouseContractCompareService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseContractInEntity;
+import com.example.pojo.gdc.vo.contract.RentInVo;
+import com.example.service.gdc.WzHouseContractCompareService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;
@@ -34,17 +33,17 @@ public class WzHouseContractCompareController {
     @Autowired
     private WzHouseContractCompareService wzHouseContractCompareService;
 
-    @RequestMapping("/list")
-    @IgnoreAuth
-    public R list(@RequestBody PageMap pageMap) {
-        //查询列表数据
-        Query query = new Query(pageMap);
-        List<WzHouseContractCompareEntity> list = wzHouseContractCompareService.queryList(query);
-        Query query1 = new Query(pageMap);
-        int total = wzHouseContractCompareService.queryTotal(query1);
-        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
-        return R.ok().put("page", pageUtil);
-    }
+//    @RequestMapping("/list")
+//    @IgnoreAuth
+//    public R list(@RequestBody PageMap pageMap) {
+//        //查询列表数据
+//        Query query = new Query(pageMap);
+//        List<WzHouseContractCompareEntity> list = wzHouseContractCompareService.queryList(query);
+//        Query query1 = new Query(pageMap);
+//        int total = wzHouseContractCompareService.queryTotal(query1);
+//        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
+//        return R.ok().put("page", pageUtil);
+//    }
 
     @RequestMapping("/echartList")
     @IgnoreAuth

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

@@ -1,11 +1,11 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseContractInEntity;
-import com.example.entity.vo.contract.RentInVo;
-import com.example.service.WzHouseContractInService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseContractInEntity;
+import com.example.pojo.gdc.vo.contract.RentInVo;
+import com.example.service.gdc.WzHouseContractInService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;
@@ -33,17 +33,17 @@ public class WzHouseContractInController {
     @Autowired
     private WzHouseContractInService wzHouseContractInService;
 
-    @RequestMapping("/list")
-    @IgnoreAuth
-    public R list(@RequestBody PageMap pageMap) {
-        //查询列表数据
-        Query query = new Query(pageMap);
-        List<WzHouseContractInEntity> list = wzHouseContractInService.queryList(query);
-        Query query1 = new Query(pageMap);
-        int total = wzHouseContractInService.queryTotal(query1);
-        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
-        return R.ok().put("page", pageUtil);
-    }
+//    @RequestMapping("/list")
+//    @IgnoreAuth
+//    public R list(@RequestBody PageMap pageMap) {
+//        //查询列表数据
+//        Query query = new Query(pageMap);
+//        List<WzHouseContractInEntity> list = wzHouseContractInService.queryList(query);
+//        Query query1 = new Query(pageMap);
+//        int total = wzHouseContractInService.queryTotal(query1);
+//        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
+//        return R.ok().put("page", pageUtil);
+//    }
 
     @RequestMapping("/echartList")
     @IgnoreAuth

src/main/java/com/example/controller/WzHouseContractOutController.java → src/main/java/com/example/controller/gdc/WzHouseContractOutController.java

@@ -1,9 +1,9 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.WzHouseContracEntity;
-import com.example.entity.WzHouseContractOutEntity;
-import com.example.service.WzHouseContractOutService;
+import com.example.pojo.gdc.WzHouseContracEntity;
+import com.example.pojo.gdc.WzHouseContractOutEntity;
+import com.example.service.gdc.WzHouseContractOutService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -1,12 +1,11 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseContractInEntity;
-import com.example.entity.WzHouseContractTopEntity;
-import com.example.entity.vo.contract.RentInVo;
-import com.example.service.WzHouseContractTopService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseContractInEntity;
+import com.example.pojo.gdc.vo.contract.RentInVo;
+import com.example.service.gdc.WzHouseContractTopService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;
@@ -34,24 +33,24 @@ public class WzHouseContractTopController {
     @Autowired
     private WzHouseContractTopService wzHouseContractTopService;
 
-    @RequestMapping("/list")
-    @IgnoreAuth
-    public R list(@RequestBody PageMap pageMap) {
-        //查询列表数据
-        Query query = new Query(pageMap);
-        List<WzHouseContractTopEntity> list = wzHouseContractTopService.queryList(query);
-        for (WzHouseContractTopEntity topEntity : list) {
-            try{
-                topEntity.setHireTime(String.valueOf(formatDouble(Double.valueOf(topEntity.getHireTime()))));
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-        }
-        Query query1 = new Query(pageMap);
-        int total = wzHouseContractTopService.queryTotal(query1);
-        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
-        return R.ok().put("page", pageUtil);
-    }
+//    @RequestMapping("/list")
+//    @IgnoreAuth
+//    public R list(@RequestBody PageMap pageMap) {
+//        //查询列表数据
+//        Query query = new Query(pageMap);
+//        List<WzHouseContractTopEntity> list = wzHouseContractTopService.queryList(query);
+//        for (WzHouseContractTopEntity topEntity : list) {
+//            try{
+//                topEntity.setHireTime(String.valueOf(formatDouble(Double.valueOf(topEntity.getHireTime()))));
+//            }catch (Exception e){
+//                e.printStackTrace();
+//            }
+//        }
+//        Query query1 = new Query(pageMap);
+//        int total = wzHouseContractTopService.queryTotal(query1);
+//        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
+//        return R.ok().put("page", pageUtil);
+//    }
 
     @RequestMapping("/echartList")
     @IgnoreAuth

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

@@ -1,10 +1,10 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseCustomerEntity;
-import com.example.service.WzHouseCustomerService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseCustomerEntity;
+import com.example.service.gdc.WzHouseCustomerService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -1,10 +1,10 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseInCustomerEntity;
-import com.example.service.WzHouseInCustomerService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseInCustomerEntity;
+import com.example.service.gdc.WzHouseInCustomerService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -1,35 +1,32 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseContracEntity;
-import com.example.entity.WzHouseContractCompareEntity;
-import com.example.entity.WzHouseContractInEntity;
-import com.example.entity.WzHouseContractTopEntity;
-import com.example.entity.WzHouseLeaseInConEntity;
-import com.example.entity.WzHouseUseEntity;
-import com.example.entity.vo.WzHouseUseVo;
-import com.example.service.WzHouseContractCompareService;
-import com.example.service.WzHouseContractInService;
-import com.example.service.WzHouseContractTopService;
-import com.example.service.WzHouseLeaseInConService;
-import com.example.service.WzHouseUseService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseContracEntity;
+import com.example.pojo.gdc.WzHouseContractCompareEntity;
+import com.example.pojo.gdc.WzHouseContractInEntity;
+import com.example.pojo.gdc.WzHouseContractTopEntity;
+import com.example.pojo.gdc.WzHouseLeaseInConEntity;
+import com.example.pojo.gdc.WzHouseUseEntity;
+import com.example.pojo.gdc.vo.WzHouseUseVo;
+import com.example.service.gdc.WzHouseContractCompareService;
+import com.example.service.gdc.WzHouseContractInService;
+import com.example.service.gdc.WzHouseContractTopService;
+import com.example.service.gdc.WzHouseLeaseInConService;
+import com.example.service.gdc.WzHouseUseService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;
 import com.example.utils.R;
 import com.example.utils.excel.ExcelExport;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -67,244 +64,244 @@ public class WzHouseLeaseInConController {
         return R.ok().put("page", pageUtil);
     }
 
-    @RequestMapping("/echartList")
-    @IgnoreAuth
-    public R echartList(@RequestBody PageMap pageMap) {
-        //查询列表数据
-        Query query = new Query(pageMap);
-        List<WzHouseLeaseInConEntity> wzHouseContracEntityList = wzHouseLeaseInConService.queryList(pageMap.getMap());
-
-        Map<String,List<WzHouseLeaseInConEntity>> cityMap=new HashMap<>();
-        for (WzHouseLeaseInConEntity leaveUseVo : wzHouseContracEntityList) {
-            List<WzHouseLeaseInConEntity> list;
-            if(cityMap.get(leaveUseVo.getStandardAddressLevel2())!=null){
-                list=cityMap.get(leaveUseVo.getStandardAddressLevel2());
-                list.add(leaveUseVo);
-            }else{
-                list=new ArrayList<>();
-                list.add(leaveUseVo);
-            }
-            cityMap.put(leaveUseVo.getStandardAddressLevel2(),list);
-        }
-
-        List<WzHouseLeaseInConEntity> resultList=new ArrayList<>();
-        List<WzHouseLeaseInConEntity> cityList=new ArrayList<>();
-
-        double allContractQuantity=0l;            // 租入合同数量
-        double allNoTaxContractAmount=0l;         // 合同总金额（含税）（元）
-        double allRentArea=0l;                    // 总计面积（平米）
-        double allUnitPricePerSquareMeter=0l;     // 每平米单价
-
-         double allbusinessAreaSquaMete=0l;            //营业面积（平米）
-         double allofficeAreaSquaMete=0l;              //办公面积（平米）
-         double allcommunicationRoomAreaSquaMete=0l;  //通信机房面积（平米）
-         double allotherUsageAreaSquaMete=0l;         //其他用途面积（平米）
-
-        int cityNum=0;
-        for(Map.Entry<String,List<WzHouseLeaseInConEntity>> entry:cityMap.entrySet()){
-            List<WzHouseLeaseInConEntity> list=entry.getValue();
-
-            if (list.get(0).getStandardAddressLevel3().equals("全省")) {
-                continue;
-            }
-            //县的Map集合
-            Map<String, List<WzHouseLeaseInConEntity>> countyMap = new HashMap<>();
-            for (WzHouseLeaseInConEntity leaveUseVo : list) {
-                if (leaveUseVo.getStandardAddressLevel3() == null || leaveUseVo.getStandardAddressLevel3().equals("")) {
-                    continue;
-                }
-                if (countyMap.get(leaveUseVo.getStandardAddressLevel3()) != null) {
-                    list = countyMap.get(leaveUseVo.getStandardAddressLevel3());
-                    list.add(leaveUseVo);
-                } else {
-                    list = new ArrayList<>();
-                    list.add(leaveUseVo);
-                }
-                countyMap.put(leaveUseVo.getStandardAddressLevel3(), list);
-            }
-
-            double cityContractQuantity=0l;
-            double cityNoTaxContractAmount=0l;
-            double cityRentArea=0l;
-            double cityUnitPricePerSquareMeter=0l;
-
-            double citybusinessAreaSquaMete=0l;            //营业面积（平米）
-            double cityofficeAreaSquaMete=0l;              //办公面积（平米）
-            double citycommunicationRoomAreaSquaMete=0l;  //通信机房面积（平米）
-            double cityotherUsageAreaSquaMete=0l;         //其他用途面积（平米）
-            List<WzHouseLeaseInConEntity> countyList=new ArrayList<>();
-            for (Map.Entry<String, List<WzHouseLeaseInConEntity>> countyEntry : countyMap.entrySet()) {
-                double contractQuantity=0l;
-                double noTaxContractAmount=0l;
-                double rentArea=0l;
-                double unitPricePerSquareMeter=0l;
-
-                double businessAreaSquaMete=0l;            //营业面积（平米）
-                double officeAreaSquaMete=0l;              //办公面积（平米）
-                double communicationRoomAreaSquaMete=0l;  //通信机房面积（平米）
-                double otherUsageAreaSquaMete=0l;         //其他用途面积（平米）
-                for (WzHouseLeaseInConEntity leaveUseVo : countyEntry.getValue()) {
-                    contractQuantity+=leaveUseVo.getLeaInContracQuantity();
-                    noTaxContractAmount+=leaveUseVo.getTotalContrAmount();
-                    rentArea+=leaveUseVo.getTotalAreaSquaMete();
-                    unitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
-                     businessAreaSquaMete+= leaveUseVo.getBusinessAreaSquaMete();
-                     officeAreaSquaMete+=leaveUseVo.getOfficeAreaSquaMete();
-                     communicationRoomAreaSquaMete+=leaveUseVo.getCommunicationRoomAreaSquaMete();
-                     otherUsageAreaSquaMete+=leaveUseVo.getOtherUsageAreaSquaMete();
-
-                    cityContractQuantity+=leaveUseVo.getLeaInContracQuantity();
-                    cityNoTaxContractAmount+=leaveUseVo.getTotalContrAmount();
-                    cityRentArea+=leaveUseVo.getTotalAreaSquaMete();
-                    cityUnitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
-                    citybusinessAreaSquaMete+= leaveUseVo.getBusinessAreaSquaMete();
-                    cityofficeAreaSquaMete+=leaveUseVo.getOfficeAreaSquaMete();
-                    citycommunicationRoomAreaSquaMete+=leaveUseVo.getCommunicationRoomAreaSquaMete();
-                    cityotherUsageAreaSquaMete+=leaveUseVo.getOtherUsageAreaSquaMete();
-
-                    allContractQuantity+=leaveUseVo.getLeaInContracQuantity();
-                    allNoTaxContractAmount+=leaveUseVo.getTotalContrAmount();
-                    allRentArea+=leaveUseVo.getTotalAreaSquaMete();
-                    allUnitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
-                    allbusinessAreaSquaMete+= leaveUseVo.getBusinessAreaSquaMete();
-                    allofficeAreaSquaMete+=leaveUseVo.getOfficeAreaSquaMete();
-                    allcommunicationRoomAreaSquaMete+=leaveUseVo.getCommunicationRoomAreaSquaMete();
-                    allotherUsageAreaSquaMete+=leaveUseVo.getOtherUsageAreaSquaMete();
-                }
-                WzHouseLeaseInConEntity wzHouseInCustomerEntity = new WzHouseLeaseInConEntity();
-                wzHouseInCustomerEntity.setLeaInContracQuantity(formatDouble(contractQuantity));
-                wzHouseInCustomerEntity.setStandardAddressLevel2(countyEntry.getKey());
-                wzHouseInCustomerEntity.setTotalContrAmount(formatDouble(noTaxContractAmount));
-                wzHouseInCustomerEntity.setTotalAreaSquaMete(formatDouble(rentArea));
-                wzHouseInCustomerEntity.setUnitPricePerSquareMeter(formatDouble(unitPricePerSquareMeter));
-                wzHouseInCustomerEntity.setBusinessAreaSquaMete(formatDouble(businessAreaSquaMete));
-                wzHouseInCustomerEntity.setOfficeAreaSquaMete(formatDouble(officeAreaSquaMete));
-                wzHouseInCustomerEntity.setCommunicationRoomAreaSquaMete(formatDouble(communicationRoomAreaSquaMete));
-                wzHouseInCustomerEntity.setOtherUsageAreaSquaMete(formatDouble(otherUsageAreaSquaMete));
-                countyList.add(wzHouseInCustomerEntity);
-            }
-            List<WzHouseLeaseInConEntity> orderCountyList=new ArrayList<>();
-            try{
-                //对countList 进行排序
-                String city=list.get(0).getStandardAddressLevel2();
-                if(city.contains("市")){
-                    city=city.split("市")[0];
-                }
-                OtnAreaEntity area=otnAreaService.queryObject(city);
-                List<OtnAreaEntity> countyAreaList=otnAreaService.getCityOption(area.getId());
-                int i=0;
-                for (OtnAreaEntity otnAreaEntity : countyAreaList) {
-                    for (WzHouseLeaseInConEntity wzCity : countyList) {
-                        if(wzCity.getStandardAddressLevel2().contains(otnAreaEntity.getName())){
-                            i++;
-                            wzCity.setFlag(i%2==0);
-                            orderCountyList.add(wzCity);
-                        }
-                    }
-                }
-            }catch (Exception e){
-                orderCountyList=countyList;
-                e.printStackTrace();
-            }
-
-            WzHouseLeaseInConEntity wzHouseInCustomerEntity = new WzHouseLeaseInConEntity();
-            wzHouseInCustomerEntity.setStandardAddressLevel2(entry.getKey());
-            wzHouseInCustomerEntity.setLeaInContracQuantity(formatDouble(cityContractQuantity));
-            wzHouseInCustomerEntity.setTotalContrAmount(formatDouble(cityNoTaxContractAmount));
-            wzHouseInCustomerEntity.setTotalAreaSquaMete(formatDouble(cityRentArea));
-            wzHouseInCustomerEntity.setBusinessAreaSquaMete(formatDouble(citybusinessAreaSquaMete));
-            wzHouseInCustomerEntity.setOfficeAreaSquaMete(formatDouble(cityofficeAreaSquaMete));
-            wzHouseInCustomerEntity.setCommunicationRoomAreaSquaMete(formatDouble(citycommunicationRoomAreaSquaMete));
-            wzHouseInCustomerEntity.setOtherUsageAreaSquaMete(formatDouble(cityotherUsageAreaSquaMete));
-            double num=cityUnitPricePerSquareMeter/countyMap.size();
-            cityNum+=countyMap.size();
-            wzHouseInCustomerEntity.setUnitPricePerSquareMeter(formatDouble(num));
-            wzHouseInCustomerEntity.setChildren(orderCountyList);
-            cityList.add(wzHouseInCustomerEntity);
-        }
-
-
-        //对cityList 进行排序
-        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
-        List<WzHouseLeaseInConEntity> orderList=new ArrayList<>();
-        int i=0;
-        for (OtnAreaEntity otnAreaEntity : areaList) {
-            for (WzHouseLeaseInConEntity wzCity : cityList) {
-                if(wzCity.getStandardAddressLevel2().contains(otnAreaEntity.getName())){
-                    wzCity.setFlag(i%2==0);
-                    i++;
-                    orderList.add(wzCity);
-                }
-            }
-        }
-
-        WzHouseLeaseInConEntity province=new WzHouseLeaseInConEntity();
-        province.setStandardAddressLevel2("全省");
-        province.setLeaInContracQuantity(formatDouble(allContractQuantity));
-        province.setTotalContrAmount(formatDouble(allNoTaxContractAmount));
-        province.setTotalAreaSquaMete(formatDouble(allRentArea));
-        if(cityList.size()!=0){
-            province.setUnitPricePerSquareMeter(formatDouble(allUnitPricePerSquareMeter/cityNum ));
-        }
-        province.setBusinessAreaSquaMete(formatDouble(allbusinessAreaSquaMete));
-        province.setOfficeAreaSquaMete(formatDouble(allofficeAreaSquaMete));
-        province.setCommunicationRoomAreaSquaMete(formatDouble(allcommunicationRoomAreaSquaMete));
-        province.setOtherUsageAreaSquaMete(formatDouble(allotherUsageAreaSquaMete));
-        province.setChildren(orderList);
-        if(orderList.size()>0){
-            resultList.add(province);
-        }
-        int total = wzHouseLeaseInConService.queryTotal(query);
-        PageUtils pageUtil = new PageUtils(resultList, total, query.getLimit(), query.getPage());
-        return R.ok().put("page", pageUtil);
-    }
-
-    /**
-     * 清单excel
-     */
-    @GetMapping("/excel")
-    @IgnoreAuth
-    public void excel(String statisticalMonth,String name,String buildingNameAlias,String city,String county, HttpServletResponse response) {
-        Map<String,Object> map1=new HashMap<>();
-        if(buildingNameAlias!=null){
-            map1.put("buildingNameAlias",buildingNameAlias);
-        }
-        if(buildingNameAlias!=null){
-            map1.put("statisticalMonth",statisticalMonth);
-        }
-        if(city!=null){
-            map1.put("city",city);
-        }
-        if(county!=null){
-            map1.put("county",county);
-        }
-
-        DateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
-        ExcelExport ee1;
-
-        //判定是闲置管理还是记录
-        if(name.contains("合同管理")){
-            ee1= new ExcelExport("房屋租入_合同管理" + df.format(new Date()));
-            responseTab1(df,ee1,map1);
-            ee1.export(response);
-        }else if(name.contains("租入用途管理")){
-            ee1= new ExcelExport("房屋租入_租入用途管理" + df.format(new Date()));
-            responseTab2(df,ee1,map1);
-            ee1.export(response);
-        }else if(name.contains("租入房屋单价前10名")){
-            ee1= new ExcelExport("房屋租入_租入房屋单价前10名" + df.format(new Date()));
-            responseTab3(df,ee1,map1);
-            ee1.export(response);
-        }else if(name.contains("租入单价与平均单价比较")){
-            ee1= new ExcelExport("房屋租入_租入单价与平均单价比较" + df.format(new Date()));
-            responseTab4(df,ee1,map1);
-            ee1.export(response);
-        }else if(name.contains("租入合同记录")){
-            ee1= new ExcelExport("房屋租入_租入合同记录" + df.format(new Date()));
-            responseTab5(df,ee1,map1);
-            ee1.export(response);
-        }
-    }
+//    @RequestMapping("/echartList")
+//    @IgnoreAuth
+//    public R echartList(@RequestBody PageMap pageMap) {
+//        //查询列表数据
+//        Query query = new Query(pageMap);
+//        List<WzHouseLeaseInConEntity> wzHouseContracEntityList = wzHouseLeaseInConService.queryList(pageMap.getMap());
+//
+//        Map<String,List<WzHouseLeaseInConEntity>> cityMap=new HashMap<>();
+//        for (WzHouseLeaseInConEntity leaveUseVo : wzHouseContracEntityList) {
+//            List<WzHouseLeaseInConEntity> list;
+//            if(cityMap.get(leaveUseVo.getStandardAddressLevel2())!=null){
+//                list=cityMap.get(leaveUseVo.getStandardAddressLevel2());
+//                list.add(leaveUseVo);
+//            }else{
+//                list=new ArrayList<>();
+//                list.add(leaveUseVo);
+//            }
+//            cityMap.put(leaveUseVo.getStandardAddressLevel2(),list);
+//        }
+//
+//        List<WzHouseLeaseInConEntity> resultList=new ArrayList<>();
+//        List<WzHouseLeaseInConEntity> cityList=new ArrayList<>();
+//
+//        double allContractQuantity=0l;            // 租入合同数量
+//        double allNoTaxContractAmount=0l;         // 合同总金额（含税）（元）
+//        double allRentArea=0l;                    // 总计面积（平米）
+//        double allUnitPricePerSquareMeter=0l;     // 每平米单价
+//
+//         double allbusinessAreaSquaMete=0l;            //营业面积（平米）
+//         double allofficeAreaSquaMete=0l;              //办公面积（平米）
+//         double allcommunicationRoomAreaSquaMete=0l;  //通信机房面积（平米）
+//         double allotherUsageAreaSquaMete=0l;         //其他用途面积（平米）
+//
+//        int cityNum=0;
+//        for(Map.Entry<String,List<WzHouseLeaseInConEntity>> entry:cityMap.entrySet()){
+//            List<WzHouseLeaseInConEntity> list=entry.getValue();
+//
+//            if (list.get(0).getStandardAddressLevel3().equals("全省")) {
+//                continue;
+//            }
+//            //县的Map集合
+//            Map<String, List<WzHouseLeaseInConEntity>> countyMap = new HashMap<>();
+//            for (WzHouseLeaseInConEntity leaveUseVo : list) {
+//                if (leaveUseVo.getStandardAddressLevel3() == null || leaveUseVo.getStandardAddressLevel3().equals("")) {
+//                    continue;
+//                }
+//                if (countyMap.get(leaveUseVo.getStandardAddressLevel3()) != null) {
+//                    list = countyMap.get(leaveUseVo.getStandardAddressLevel3());
+//                    list.add(leaveUseVo);
+//                } else {
+//                    list = new ArrayList<>();
+//                    list.add(leaveUseVo);
+//                }
+//                countyMap.put(leaveUseVo.getStandardAddressLevel3(), list);
+//            }
+//
+//            double cityContractQuantity=0l;
+//            double cityNoTaxContractAmount=0l;
+//            double cityRentArea=0l;
+//            double cityUnitPricePerSquareMeter=0l;
+//
+//            double citybusinessAreaSquaMete=0l;            //营业面积（平米）
+//            double cityofficeAreaSquaMete=0l;              //办公面积（平米）
+//            double citycommunicationRoomAreaSquaMete=0l;  //通信机房面积（平米）
+//            double cityotherUsageAreaSquaMete=0l;         //其他用途面积（平米）
+//            List<WzHouseLeaseInConEntity> countyList=new ArrayList<>();
+//            for (Map.Entry<String, List<WzHouseLeaseInConEntity>> countyEntry : countyMap.entrySet()) {
+//                double contractQuantity=0l;
+//                double noTaxContractAmount=0l;
+//                double rentArea=0l;
+//                double unitPricePerSquareMeter=0l;
+//
+//                double businessAreaSquaMete=0l;            //营业面积（平米）
+//                double officeAreaSquaMete=0l;              //办公面积（平米）
+//                double communicationRoomAreaSquaMete=0l;  //通信机房面积（平米）
+//                double otherUsageAreaSquaMete=0l;         //其他用途面积（平米）
+//                for (WzHouseLeaseInConEntity leaveUseVo : countyEntry.getValue()) {
+//                    contractQuantity+=leaveUseVo.getLeaInContracQuantity();
+//                    noTaxContractAmount+=leaveUseVo.getTotalContrAmount();
+//                    rentArea+=leaveUseVo.getTotalAreaSquaMete();
+//                    unitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
+//                     businessAreaSquaMete+= leaveUseVo.getBusinessAreaSquaMete();
+//                     officeAreaSquaMete+=leaveUseVo.getOfficeAreaSquaMete();
+//                     communicationRoomAreaSquaMete+=leaveUseVo.getCommunicationRoomAreaSquaMete();
+//                     otherUsageAreaSquaMete+=leaveUseVo.getOtherUsageAreaSquaMete();
+//
+//                    cityContractQuantity+=leaveUseVo.getLeaInContracQuantity();
+//                    cityNoTaxContractAmount+=leaveUseVo.getTotalContrAmount();
+//                    cityRentArea+=leaveUseVo.getTotalAreaSquaMete();
+//                    cityUnitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
+//                    citybusinessAreaSquaMete+= leaveUseVo.getBusinessAreaSquaMete();
+//                    cityofficeAreaSquaMete+=leaveUseVo.getOfficeAreaSquaMete();
+//                    citycommunicationRoomAreaSquaMete+=leaveUseVo.getCommunicationRoomAreaSquaMete();
+//                    cityotherUsageAreaSquaMete+=leaveUseVo.getOtherUsageAreaSquaMete();
+//
+//                    allContractQuantity+=leaveUseVo.getLeaInContracQuantity();
+//                    allNoTaxContractAmount+=leaveUseVo.getTotalContrAmount();
+//                    allRentArea+=leaveUseVo.getTotalAreaSquaMete();
+//                    allUnitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
+//                    allbusinessAreaSquaMete+= leaveUseVo.getBusinessAreaSquaMete();
+//                    allofficeAreaSquaMete+=leaveUseVo.getOfficeAreaSquaMete();
+//                    allcommunicationRoomAreaSquaMete+=leaveUseVo.getCommunicationRoomAreaSquaMete();
+//                    allotherUsageAreaSquaMete+=leaveUseVo.getOtherUsageAreaSquaMete();
+//                }
+//                WzHouseLeaseInConEntity wzHouseInCustomerEntity = new WzHouseLeaseInConEntity();
+//                wzHouseInCustomerEntity.setLeaInContracQuantity(formatDouble(contractQuantity));
+//                wzHouseInCustomerEntity.setStandardAddressLevel2(countyEntry.getKey());
+//                wzHouseInCustomerEntity.setTotalContrAmount(formatDouble(noTaxContractAmount));
+//                wzHouseInCustomerEntity.setTotalAreaSquaMete(formatDouble(rentArea));
+//                wzHouseInCustomerEntity.setUnitPricePerSquareMeter(formatDouble(unitPricePerSquareMeter));
+//                wzHouseInCustomerEntity.setBusinessAreaSquaMete(formatDouble(businessAreaSquaMete));
+//                wzHouseInCustomerEntity.setOfficeAreaSquaMete(formatDouble(officeAreaSquaMete));
+//                wzHouseInCustomerEntity.setCommunicationRoomAreaSquaMete(formatDouble(communicationRoomAreaSquaMete));
+//                wzHouseInCustomerEntity.setOtherUsageAreaSquaMete(formatDouble(otherUsageAreaSquaMete));
+//                countyList.add(wzHouseInCustomerEntity);
+//            }
+//            List<WzHouseLeaseInConEntity> orderCountyList=new ArrayList<>();
+//            try{
+//                //对countList 进行排序
+//                String city=list.get(0).getStandardAddressLevel2();
+//                if(city.contains("市")){
+//                    city=city.split("市")[0];
+//                }
+//                OtnAreaEntity area=otnAreaService.queryObject(city);
+//                List<OtnAreaEntity> countyAreaList=otnAreaService.getCityOption(area.getId());
+//                int i=0;
+//                for (OtnAreaEntity otnAreaEntity : countyAreaList) {
+//                    for (WzHouseLeaseInConEntity wzCity : countyList) {
+//                        if(wzCity.getStandardAddressLevel2().contains(otnAreaEntity.getName())){
+//                            i++;
+//                            wzCity.setFlag(i%2==0);
+//                            orderCountyList.add(wzCity);
+//                        }
+//                    }
+//                }
+//            }catch (Exception e){
+//                orderCountyList=countyList;
+//                e.printStackTrace();
+//            }
+//
+//            WzHouseLeaseInConEntity wzHouseInCustomerEntity = new WzHouseLeaseInConEntity();
+//            wzHouseInCustomerEntity.setStandardAddressLevel2(entry.getKey());
+//            wzHouseInCustomerEntity.setLeaInContracQuantity(formatDouble(cityContractQuantity));
+//            wzHouseInCustomerEntity.setTotalContrAmount(formatDouble(cityNoTaxContractAmount));
+//            wzHouseInCustomerEntity.setTotalAreaSquaMete(formatDouble(cityRentArea));
+//            wzHouseInCustomerEntity.setBusinessAreaSquaMete(formatDouble(citybusinessAreaSquaMete));
+//            wzHouseInCustomerEntity.setOfficeAreaSquaMete(formatDouble(cityofficeAreaSquaMete));
+//            wzHouseInCustomerEntity.setCommunicationRoomAreaSquaMete(formatDouble(citycommunicationRoomAreaSquaMete));
+//            wzHouseInCustomerEntity.setOtherUsageAreaSquaMete(formatDouble(cityotherUsageAreaSquaMete));
+//            double num=cityUnitPricePerSquareMeter/countyMap.size();
+//            cityNum+=countyMap.size();
+//            wzHouseInCustomerEntity.setUnitPricePerSquareMeter(formatDouble(num));
+//            wzHouseInCustomerEntity.setChildren(orderCountyList);
+//            cityList.add(wzHouseInCustomerEntity);
+//        }
+//
+//
+//        //对cityList 进行排序
+//        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
+//        List<WzHouseLeaseInConEntity> orderList=new ArrayList<>();
+//        int i=0;
+//        for (OtnAreaEntity otnAreaEntity : areaList) {
+//            for (WzHouseLeaseInConEntity wzCity : cityList) {
+//                if(wzCity.getStandardAddressLevel2().contains(otnAreaEntity.getName())){
+//                    wzCity.setFlag(i%2==0);
+//                    i++;
+//                    orderList.add(wzCity);
+//                }
+//            }
+//        }
+//
+//        WzHouseLeaseInConEntity province=new WzHouseLeaseInConEntity();
+//        province.setStandardAddressLevel2("全省");
+//        province.setLeaInContracQuantity(formatDouble(allContractQuantity));
+//        province.setTotalContrAmount(formatDouble(allNoTaxContractAmount));
+//        province.setTotalAreaSquaMete(formatDouble(allRentArea));
+//        if(cityList.size()!=0){
+//            province.setUnitPricePerSquareMeter(formatDouble(allUnitPricePerSquareMeter/cityNum ));
+//        }
+//        province.setBusinessAreaSquaMete(formatDouble(allbusinessAreaSquaMete));
+//        province.setOfficeAreaSquaMete(formatDouble(allofficeAreaSquaMete));
+//        province.setCommunicationRoomAreaSquaMete(formatDouble(allcommunicationRoomAreaSquaMete));
+//        province.setOtherUsageAreaSquaMete(formatDouble(allotherUsageAreaSquaMete));
+//        province.setChildren(orderList);
+//        if(orderList.size()>0){
+//            resultList.add(province);
+//        }
+//        int total = wzHouseLeaseInConService.queryTotal(query);
+//        PageUtils pageUtil = new PageUtils(resultList, total, query.getLimit(), query.getPage());
+//        return R.ok().put("page", pageUtil);
+//    }
+
+//    /**
+//     * 清单excel
+//     */
+//    @GetMapping("/excel")
+//    @IgnoreAuth
+//    public void excel(String statisticalMonth,String name,String buildingNameAlias,String city,String county, HttpServletResponse response) {
+//        Map<String,Object> map1=new HashMap<>();
+//        if(buildingNameAlias!=null){
+//            map1.put("buildingNameAlias",buildingNameAlias);
+//        }
+//        if(buildingNameAlias!=null){
+//            map1.put("statisticalMonth",statisticalMonth);
+//        }
+//        if(city!=null){
+//            map1.put("city",city);
+//        }
+//        if(county!=null){
+//            map1.put("county",county);
+//        }
+//
+//        DateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
+//        ExcelExport ee1;
+//
+//        //判定是闲置管理还是记录
+//        if(name.contains("合同管理")){
+//            ee1= new ExcelExport("房屋租入_合同管理" + df.format(new Date()));
+//            responseTab1(df,ee1,map1);
+//            ee1.export(response);
+//        }else if(name.contains("租入用途管理")){
+//            ee1= new ExcelExport("房屋租入_租入用途管理" + df.format(new Date()));
+//            responseTab2(df,ee1,map1);
+//            ee1.export(response);
+//        }else if(name.contains("租入房屋单价前10名")){
+//            ee1= new ExcelExport("房屋租入_租入房屋单价前10名" + df.format(new Date()));
+//            responseTab3(df,ee1,map1);
+//            ee1.export(response);
+//        }else if(name.contains("租入单价与平均单价比较")){
+//            ee1= new ExcelExport("房屋租入_租入单价与平均单价比较" + df.format(new Date()));
+//            responseTab4(df,ee1,map1);
+//            ee1.export(response);
+//        }else if(name.contains("租入合同记录")){
+//            ee1= new ExcelExport("房屋租入_租入合同记录" + df.format(new Date()));
+//            responseTab5(df,ee1,map1);
+//            ee1.export(response);
+//        }
+//    }
 
     public void responseTab1(DateFormat df, ExcelExport ee1, Map<String, Object> map1){
         //查询列表数据

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

@@ -1,10 +1,10 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseMaintEntity;
-import com.example.service.WzHouseMaintService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseMaintEntity;
+import com.example.service.gdc.WzHouseMaintService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -1,16 +1,16 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseMaintEntity;
-import com.example.entity.WzHouseMaintenaCostEntity;
-import com.example.entity.vo.DailyModifyVo;
-import com.example.entity.vo.HighFrequencyVo;
-import com.example.entity.vo.housecost.HouseCostVo;
-import com.example.service.WzHouseMaintService;
-import com.example.service.WzHouseMaintenaCostService;
-import com.example.service.WzOtnAreaService;
-import com.example.service.WzStrategyService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseMaintEntity;
+import com.example.pojo.gdc.WzHouseMaintenaCostEntity;
+import com.example.pojo.gdc.vo.DailyModifyVo;
+import com.example.pojo.gdc.vo.HighFrequencyVo;
+import com.example.pojo.gdc.vo.housecost.HouseCostVo;
+import com.example.service.gdc.WzHouseMaintService;
+import com.example.service.gdc.WzHouseMaintenaCostService;
+import com.example.service.gdc.WzOtnAreaService;
+import com.example.service.gdc.WzStrategyService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

src/main/java/com/example/controller/WzHouseMarketController.java → src/main/java/com/example/controller/gdc/WzHouseMarketController.java

@@ -1,8 +1,8 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.WzHouseMarketEntity;
-import com.example.service.WzHouseMarketService;
+import com.example.pojo.gdc.WzHouseMarketEntity;
+import com.example.service.gdc.WzHouseMarketService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -0,0 +1,357 @@
+package com.example.controller.gdc;
+
+import com.example.config.annotation.IgnoreAuth;
+import com.example.pojo.gdc.WzHouseUseEntity;
+import com.example.service.gdc.WzHouseUseService;
+import com.example.service.gdc.WzOtnAreaService;
+import com.example.utils.PageMap;
+import com.example.utils.PageUtils;
+import com.example.utils.Query;
+import com.example.utils.R;
+import com.example.utils.excel.ExcelExport;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 房屋租入（租入用途管理）
+ */
+@RestController
+@RequestMapping("/house-car/house/dist/api/WzHouseUse")
+public class WzHouseUseController {
+
+    @Autowired
+    private WzHouseUseService wzHouseUseService;
+    @Autowired
+    private WzOtnAreaService otnAreaService;
+
+    @RequestMapping("/list")
+    @IgnoreAuth
+    public R list(@RequestBody PageMap pageMap) {
+        //查询列表数据
+        Query query = new Query(pageMap);
+        List<WzHouseUseEntity> list = wzHouseUseService.queryList(pageMap.getMap());
+        int total = wzHouseUseService.queryTotal(query);
+        PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
+        return R.ok().put("page", pageUtil);
+    }
+
+//    @RequestMapping("/echartList")
+//    @IgnoreAuth
+//    public R echartList(@RequestBody PageMap pageMap) {
+//        //查询列表数据
+//        Query query = new Query(pageMap);
+//        List<WzHouseUseEntity> wzHouseContracEntityList = wzHouseUseService.queryList(pageMap.getMap());
+//
+//        Map<String,List<WzHouseUseEntity>> cityMap=new HashMap<>();
+//        for (WzHouseUseEntity leaveUseVo : wzHouseContracEntityList) {
+//            List<WzHouseUseEntity> list;
+//            if(cityMap.get(leaveUseVo.getCity())!=null){
+//                list=cityMap.get(leaveUseVo.getCity());
+//                list.add(leaveUseVo);
+//            }else{
+//                list=new ArrayList<>();
+//                list.add(leaveUseVo);
+//            }
+//            cityMap.put(leaveUseVo.getCity(),list);
+//        }
+//
+//        List<WzHouseUseVo> resultList=new ArrayList<>();
+//        List<WzHouseUseVo> cityList=new ArrayList<>();
+//
+//        int allyingYe=0;
+//        int allbanGong=0;
+//        int alltongXin=0;
+//        int allother=0;
+//        int allall=0;
+//        for(Map.Entry<String,List<WzHouseUseEntity>> entry:cityMap.entrySet()){
+//            List<WzHouseUseEntity> list=entry.getValue();
+//
+//            if (list.get(0).getCounty().equals("全省")) {
+//                continue;
+//            }
+//            //县的Map集合
+//            Map<String, List<WzHouseUseEntity>> countyMap = new HashMap<>();
+//            for (WzHouseUseEntity leaveUseVo : list) {
+//                if (leaveUseVo.getCounty() == null || leaveUseVo.getCounty().equals("")) {
+//                    continue;
+//                }
+//                if (countyMap.get(leaveUseVo.getCounty()) != null) {
+//                    list = countyMap.get(leaveUseVo.getCounty());
+//                    list.add(leaveUseVo);
+//                } else {
+//                    list = new ArrayList<>();
+//                    list.add(leaveUseVo);
+//                }
+//                countyMap.put(leaveUseVo.getCounty(), list);
+//            }
+//
+//            int cityyingYe=0;
+//            int citybanGong=0;
+//            int citytongXin=0;
+//            int cityother=0;
+//            int cityall=0;
+//            List<WzHouseUseVo> countyList=new ArrayList<>();
+//            for (Map.Entry<String, List<WzHouseUseEntity>> countyEntry : countyMap.entrySet()) {
+//                int yingYe=0;
+//                int banGong=0;
+//                int tongXin=0;
+//                int other=0;
+//                int all=0;
+//                for (WzHouseUseEntity leaveUseVo : countyEntry.getValue()) {
+//                    if(leaveUseVo.getRentalUse()!=null){
+//                        if(leaveUseVo.getRentalUse().equals("通信设施机房")){
+//                            tongXin+=1;
+//                            citytongXin+=1;
+//                            alltongXin+=1;
+//                        }
+//                        else if(leaveUseVo.getRentalUse().equals("营业")){
+//                            yingYe+=1;
+//                            cityyingYe+=1;
+//                            allyingYe+=1;
+//                        }
+//                        else if(leaveUseVo.getRentalUse().equals("其他租入用途")){
+//                            other+=1;
+//                            cityother+=1;
+//                            allother+=1;
+//                        }
+//                        else if(leaveUseVo.getRentalUse().equals("办公")){
+//                            banGong+=1;
+//                            citybanGong+=1;
+//                            allbanGong+=1;
+//                        }
+//                        all+=1;
+//                        cityall+=1;
+//                        allall+=1;
+//                    }
+//                }
+//                WzHouseUseVo wzHouseInCustomerEntity = new WzHouseUseVo();
+//                wzHouseInCustomerEntity.setYingYe(yingYe);
+//                wzHouseInCustomerEntity.setCity(countyEntry.getKey());
+//                wzHouseInCustomerEntity.setBanGong(banGong);
+//                wzHouseInCustomerEntity.setAll(all);
+//                wzHouseInCustomerEntity.setTongXin(tongXin);
+//                wzHouseInCustomerEntity.setOther(other);
+//                countyList.add(wzHouseInCustomerEntity);
+//            }
+//            List<WzHouseUseVo> orderCountyList=new ArrayList<>();
+//            try{
+//                //对countList 进行排序
+//                String city=list.get(0).getCity();
+//                if(city.contains("市")){
+//                    city=city.split("市")[0];
+//                }
+//                OtnAreaEntity area=otnAreaService.queryObject(city);
+//                List<OtnAreaEntity> countyAreaList=otnAreaService.getCityOption(area.getId());
+//                int i=0;
+//                for (OtnAreaEntity otnAreaEntity : countyAreaList) {
+//                    for (WzHouseUseVo wzCity : countyList) {
+//                        if(wzCity.getCity().contains(otnAreaEntity.getName())){
+//                            i++;
+//                            wzCity.setFlag(i%2==0);
+//                            orderCountyList.add(wzCity);
+//                        }
+//                    }
+//                }
+//            }catch (Exception e){
+//                orderCountyList=countyList;
+//                e.printStackTrace();
+//            }
+//
+//            WzHouseUseVo wzHouseInCustomerEntity = new WzHouseUseVo();
+//            wzHouseInCustomerEntity.setCity(entry.getKey());
+//            wzHouseInCustomerEntity.setYingYe(cityyingYe);
+//            wzHouseInCustomerEntity.setBanGong(citybanGong);
+//            wzHouseInCustomerEntity.setAll(cityall);
+//            wzHouseInCustomerEntity.setTongXin(citytongXin);
+//            wzHouseInCustomerEntity.setOther(cityother);
+//            wzHouseInCustomerEntity.setChildren(orderCountyList);
+//            cityList.add(wzHouseInCustomerEntity);
+//        }
+//
+//
+//        //对cityList 进行排序
+//        List<OtnAreaEntity> areaList=otnAreaService.getCityOption("018");
+//        List<WzHouseUseVo> orderList=new ArrayList<>();
+//        int i=0;
+//        for (OtnAreaEntity otnAreaEntity : areaList) {
+//            for (WzHouseUseVo wzCity : cityList) {
+//                if(wzCity.getCity().contains(otnAreaEntity.getName())){
+//                    wzCity.setFlag(i%2==0);
+//                    i++;
+//                    orderList.add(wzCity);
+//                }
+//            }
+//        }
+//
+//        WzHouseUseVo province=new WzHouseUseVo();
+//        province.setCity("全省");
+//        province.setYingYe(allyingYe);
+//        province.setBanGong(allbanGong);
+//        province.setAll(allall);
+//        province.setTongXin(alltongXin);
+//        province.setOther(allother);
+//        province.setChildren(orderList);
+//        if(orderList.size()>0){
+//            resultList.add(province);
+//        }
+//        int total = wzHouseUseService.queryTotal(query);
+//        PageUtils pageUtil = new PageUtils(resultList, total, query.getLimit(), query.getPage());
+//        return R.ok().put("page", pageUtil);
+//    }
+
+    /**
+     * 清单excel
+     */
+    @GetMapping("/excel")
+    @IgnoreAuth
+    public void excel(String name,String buildingNameAlias,String city,String county, HttpServletResponse response) {
+        Map<String,Object> map1=new HashMap<>();
+        if(buildingNameAlias!=null){
+            map1.put("buildingNameAlias",buildingNameAlias);
+        }
+        if(city!=null){
+            map1.put("city",city);
+        }
+        if(county!=null){
+            map1.put("county",county);
+        }
+
+        DateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
+        ExcelExport ee1 = new ExcelExport("报表" + df.format(new Date()));
+
+        //判定是闲置管理还是记录
+        if(name.contains("出租合同统计")){
+//            responseTab1(df,ee1,map1);
+            ee1.export(response);
+        }else if(name.contains("出租合同记录")){
+            responseTab2(df,ee1,map1);
+            ee1.export(response);
+        }
+
+
+    }
+
+//    public void responseTab1(DateFormat df, ExcelExport ee1, Map<String, Object> map1){
+//        List<WzHouseUseEntity> wzHouseContracEntityList = wzHouseUseService.queryList(map1);
+//
+//        WzHouseContracEntity province=new WzHouseContracEntity();
+//        province.setCity("全省");
+//
+//        Map<String,List<WzHouseUseEntity>> map=new HashMap<>();
+//        for (WzHouseUseEntity leaveUseVo : wzHouseContracEntityList) {
+//            List<WzHouseUseEntity> list;
+//            if(map.get(leaveUseVo.getCity())!=null){
+//                list=map.get(leaveUseVo.getCity());
+//                list.add(leaveUseVo);
+//            }else{
+//                list=new ArrayList<>();
+//                list.add(leaveUseVo);
+//            }
+//            map.put(leaveUseVo.getCity(),list);
+//        }
+//        List<WzHouseContracEntity> resultList=new ArrayList<>();
+//        List<WzHouseContracEntity> cityList=new ArrayList<>();
+//
+//        double allContractQuantity=0l;
+//        double allNoTaxContractAmount=0l;
+//        double allRentArea=0l;
+//        double allUnitPricePerSquareMeter=0l;
+//
+//        for(Map.Entry<String,List<WzHouseUseEntity>> entry:map.entrySet()){
+//            List<WzHouseUseEntity> list=entry.getValue();
+//            double contractQuantity=0l;
+//            double noTaxContractAmount=0l;
+//            double rentArea=0l;
+//            double unitPricePerSquareMeter=0l;
+//            for (WzHouseUseEntity leaveUseVo : list) {
+//                contractQuantity+=leaveUseVo.getContractQuantity();
+//                noTaxContractAmount+=leaveUseVo.getNoTaxContractAmount();
+//                rentArea+=leaveUseVo.getRentArea();
+//                unitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
+//
+//                allContractQuantity+=leaveUseVo.getContractQuantity();
+//                allNoTaxContractAmount+=leaveUseVo.getNoTaxContractAmount();
+//                allRentArea+=leaveUseVo.getRentArea();
+//                allUnitPricePerSquareMeter+=leaveUseVo.getUnitPricePerSquareMeter();
+//            }
+//            cityList.add(list.get(0));
+//        }
+//        province.setContractQuantity(allContractQuantity);
+//        province.setNoTaxContractAmount(formatDouble(allNoTaxContractAmount));
+//        province.setRentArea(allRentArea);
+//        province.setUnitPricePerSquareMeter(formatDouble(allUnitPricePerSquareMeter));
+//        province.setChildren(cityList);
+//        resultList.add(province);
+//
+//
+//        List<Object> colList=new ArrayList();;
+//        List<Object[]> allList = new ArrayList();
+//        for (int i = 0; i < resultList.size(); i++) {
+//
+//            if(resultList.get(i).getCity().contains("省")){
+//                colList = new ArrayList();
+//                colList.add(resultList.get(i).getCity());
+//                colList.add("");
+//                colList.add(resultList.get(i).getContractQuantity());
+//                colList.add(resultList.get(i).getNoTaxContractAmount());
+//                colList.add(resultList.get(i).getRentArea());
+//                colList.add(resultList.get(i).getUnitPricePerSquareMeter());
+//                allList.add(colList.toArray());
+//
+//                //处理城市的
+//                List<WzHouseContracEntity> cityList1=resultList.get(i).getChildren();
+//                for (WzHouseContracEntity floorNoUserVo : cityList1) {
+//                    colList = new ArrayList();
+//                    colList.add("");
+//                    colList.add(floorNoUserVo.getCity());
+//                    colList.add(floorNoUserVo.getContractQuantity());
+//                    colList.add(floorNoUserVo.getNoTaxContractAmount());
+//                    colList.add(floorNoUserVo.getRentArea());
+//                    colList.add(resultList.get(i).getUnitPricePerSquareMeter());
+//                    allList.add(colList.toArray());
+//                }
+//            }
+//        }
+//        String[] header = new String[]{
+//                "资产所属单位(一级)",
+//                "资产所属单位(二级)",
+//                "合同数量",
+//                "不含税合同额(元)",
+//                "出租面积(平米)",
+//                "每平米单价(元)"
+//        };
+//        ee1.addSheetByArray(df.format(new Date()) + "清单", allList, header);
+//    }
+
+    public void responseTab2(DateFormat df, ExcelExport ee1, Map<String, Object> map1){
+
+
+
+
+    }
+
+    public double formatDouble(double num){
+        double avera=0l;
+        try{
+            DecimalFormat format2 = new DecimalFormat("#.00");
+            String str2 = format2.format(num);
+            avera = Double.parseDouble(str2);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return avera;
+    }
+
+}

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

@@ -1,12 +1,12 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzLandManageDetailsEntity;
-import com.example.entity.vo.floormanager.FloorNoUserVo;
-import com.example.entity.vo.housemanager.HouseYearVo;
-import com.example.service.WzLandManageDetailsService;
-import com.example.service.WzOtnAreaService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzLandManageDetailsEntity;
+import com.example.pojo.gdc.vo.floormanager.FloorNoUserVo;
+import com.example.pojo.gdc.vo.housemanager.HouseYearVo;
+import com.example.service.gdc.WzLandManageDetailsService;
+import com.example.service.gdc.WzOtnAreaService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

src/main/java/com/example/controller/WzLowestUnitPriceController.java → src/main/java/com/example/controller/gdc/WzLowestUnitPriceController.java

@@ -1,8 +1,8 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.WzLowestUnitPriceEntity;
-import com.example.service.WzLowestUnitPriceService;
+import com.example.pojo.gdc.WzLowestUnitPriceEntity;
+import com.example.service.gdc.WzLowestUnitPriceService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -4,9 +4,9 @@
 //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.service.gdc.WzHouseContractCompareService;
+//import com.example.service.gdc.WzHouseContractTopService;
+//import com.example.service.gdc.WzOtnAreaService;
 //import com.example.utils.PageMap;
 //import com.example.utils.PageUtils;
 //import com.example.utils.R;

src/main/java/com/example/controller/WzRemarkController.java → src/main/java/com/example/controller/gdc/WzRemarkController.java

@@ -1,8 +1,8 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.WzRemarkEntity;
-import com.example.service.WzRemarkService;
+import com.example.pojo.gdc.WzRemarkEntity;
+import com.example.service.gdc.WzRemarkService;
 import com.example.utils.PageMap;
 import com.example.utils.Query;
 import com.example.utils.R;

src/main/java/com/example/controller/WzRentHouseArrearsController.java → src/main/java/com/example/controller/gdc/WzRentHouseArrearsController.java

@@ -1,8 +1,8 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.WzRentHouseArrearsEntity;
-import com.example.service.WzRentHouseArrearsService;
+import com.example.pojo.gdc.WzRentHouseArrearsEntity;
+import com.example.service.gdc.WzRentHouseArrearsService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

src/main/java/com/example/controller/WzRentThreeMonthController.java → src/main/java/com/example/controller/gdc/WzRentThreeMonthController.java

@@ -1,8 +1,8 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.WzRentThrMonthEntity;
-import com.example.service.WzRentThreeMonthService;
+import com.example.pojo.gdc.WzRentThrMonthEntity;
+import com.example.service.gdc.WzRentThreeMonthService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

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

@@ -1,16 +1,16 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzHouseContracEntity;
-import com.example.entity.WzScoreRankingEntity;
-import com.example.entity.WzScoreVo;
-import com.example.entity.vo.housemanager.LeaveUseVo;
-import com.example.service.WzBuildManageDetailsService;
-import com.example.service.WzHouseContracService;
-import com.example.service.WzHouseMaintenaCostService;
-import com.example.service.WzOtnAreaService;
-import com.example.service.WzScoreRankingService;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzHouseContracEntity;
+import com.example.pojo.gdc.WzScoreRankingEntity;
+import com.example.pojo.gdc.WzScoreVo;
+import com.example.pojo.gdc.vo.housemanager.LeaveUseVo;
+import com.example.service.gdc.WzBuildManageDetailsService;
+import com.example.service.gdc.WzHouseContracService;
+import com.example.service.gdc.WzHouseMaintenaCostService;
+import com.example.service.gdc.WzOtnAreaService;
+import com.example.service.gdc.WzScoreRankingService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

src/main/java/com/example/controller/WzStrategyController.java → src/main/java/com/example/controller/gdc/WzStrategyController.java

@@ -1,8 +1,8 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.WzStrategyEntity;
-import com.example.service.WzStrategyService;
+import com.example.pojo.gdc.WzStrategyEntity;
+import com.example.service.gdc.WzStrategyService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

src/main/java/com/example/controller/WzUserController.java → src/main/java/com/example/controller/gdc/WzUserController.java

@@ -1,8 +1,8 @@
-package com.example.controller;
+package com.example.controller.gdc;
 
 import com.example.config.annotation.IgnoreAuth;
-import com.example.entity.WzUserEntity;
-import com.example.service.WzUserService;
+import com.example.pojo.gdc.WzUserEntity;
+import com.example.service.gdc.WzUserService;
 import com.example.utils.PageMap;
 import com.example.utils.PageUtils;
 import com.example.utils.Query;

src/main/java/com/example/controller/house/HouseWzBuildManageDetailsController.java → src/main/java/com/example/controller/house/HouseBuildManageDetailsController.java

@@ -12,7 +12,7 @@ import com.example.pojo.vo.BuildingIdleStatVo;
 import com.example.pojo.vo.HouseAgeStatVo;
 import com.example.pojo.vo.ListBuildingIdleVo;
 import com.example.pojo.vo.ListBuildingVo;
-import com.example.service.house.HouseWzBuildManageDetailsService;
+import com.example.service.house.HouseBuildManageDetailsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -28,70 +28,70 @@ import javax.validation.Valid;
 @Slf4j
 @RequestMapping("/house-car/house/dist/api/WzBuildManageDetails")
 @RestController
-public class HouseWzBuildManageDetailsController {
-    private final HouseWzBuildManageDetailsService houseWzBuildManageDetailsService;
+public class HouseBuildManageDetailsController {
+    private final HouseBuildManageDetailsService houseBuildManageDetailsService;
 
-    public HouseWzBuildManageDetailsController(HouseWzBuildManageDetailsService houseWzBuildManageDetailsService) {
-        this.houseWzBuildManageDetailsService = houseWzBuildManageDetailsService;
+    public HouseBuildManageDetailsController(HouseBuildManageDetailsService houseBuildManageDetailsService) {
+        this.houseBuildManageDetailsService = houseBuildManageDetailsService;
     }
 
     @Operation(summary = "空置1000平米以上建筑")
     @PostMapping("/ideList")
     public Rsp<PageVo<ListBuildingIdleVo>> ideList(@Valid @RequestBody ListBuildingIdleDto dto) {
-        return houseWzBuildManageDetailsService.ideList(dto);
+        return houseBuildManageDetailsService.ideList(dto);
     }
 
     @Operation(summary = "空置1000平米以上建筑导出")
     @GetMapping("/ideListExport")
     public void ideListExport(@Valid ListBuildingIdleDto.ListBuildingIdleMapDTO dto) {
-        houseWzBuildManageDetailsService.ideListExport(dto);
+        houseBuildManageDetailsService.ideListExport(dto);
     }
 
     @Operation(summary = "查询局址别名列表")
     @PostMapping("/getBuildingNameAlias")
     public Rsp<PageVo<String>> listSiteName(@RequestBody ListSiteNameDto dto) {
-        return houseWzBuildManageDetailsService.listSiteName(dto);
+        return houseBuildManageDetailsService.listSiteName(dto);
     }
 
     @Operation(summary = "查询局址编号列表")
     @PostMapping("/getBuildingNameCode")
     public Rsp<PageVo<String>> listSiteNum(@RequestBody ListSiteNumDto dto) {
-        return houseWzBuildManageDetailsService.listSiteNum(dto);
+        return houseBuildManageDetailsService.listSiteNum(dto);
     }
 
     @Operation(summary = "查询房产记录")
     @PostMapping("/queryHouseDetail")
     public Rsp<PageVo<ListBuildingVo>> listBuilding(@Valid @RequestBody ListBuildingDto dto) {
-        return houseWzBuildManageDetailsService.listBuilding(dto);
+        return houseBuildManageDetailsService.listBuilding(dto);
     }
 
     @Operation(summary = "房产记录导出")
     @GetMapping("/queryHouseDetailExport")
     public void listBuildingExport(@Valid ListBuildingDto.ListBuildingMapDTO dto) {
-        houseWzBuildManageDetailsService.listBuildingExport(dto);
+        houseBuildManageDetailsService.listBuildingExport(dto);
     }
 
     @Operation(summary = "房龄统计")
     @PostMapping("/queryHouseYear")
     public Rsp<PageVo<HouseAgeStatVo>> houseAgeStat(@Valid @RequestBody HouseAgeStatDto dto) {
-        return houseWzBuildManageDetailsService.houseAgeStat(dto);
+        return houseBuildManageDetailsService.houseAgeStat(dto);
     }
 
     @Operation(summary = "房龄统计导出")
     @GetMapping("/queryHouseYearExport")
     public void queryHouseYearExport(@Valid HouseAgeStatDto.HouseAgeStatMapDTO dto) {
-        houseWzBuildManageDetailsService.queryHouseYearExport(dto);
+        houseBuildManageDetailsService.queryHouseYearExport(dto);
     }
 
     @Operation(summary = "闲置管理")
     @PostMapping("/list")
     public Rsp<PageVo<BuildingIdleStatVo>> buildingIdleStat(@Valid @RequestBody BuildingIdleStatDto dto) {
-        return houseWzBuildManageDetailsService.buildingIdleStat(dto);
+        return houseBuildManageDetailsService.buildingIdleStat(dto);
     }
 
     @Operation(summary = "闲置管理导出")
     @GetMapping("/buildingIdleStatExport")
     public void buildingIdleStatExport(@Valid BuildingIdleStatDto.BuildingIdleStatMapDTO dto) {
-        houseWzBuildManageDetailsService.buildingIdleStatExport(dto);
+        houseBuildManageDetailsService.buildingIdleStatExport(dto);
     }
 }

src/main/java/com/example/controller/house/HouseWzBuildmanageAvageareaController.java → src/main/java/com/example/controller/house/HouseBuildmanageAvageareaController.java

@@ -4,7 +4,7 @@ import com.example.common.PageVo;
 import com.example.common.Rsp;
 import com.example.pojo.dto.BuildingOfficeAreaStatDto;
 import com.example.pojo.vo.BuildingOfficeAreaStatVo;
-import com.example.service.house.HouseWzBuildmanageAvageareaService;
+import com.example.service.house.HouseBuildmanageAvageareaService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -20,22 +20,22 @@ import javax.validation.Valid;
 @Slf4j
 @RestController
 @RequestMapping("/house-car/house/dist/api/WzBuildmanageAvagearea")
-public class HouseWzBuildmanageAvageareaController {
-    private final HouseWzBuildmanageAvageareaService houseWzBuildmanageAvageareaService;
+public class HouseBuildmanageAvageareaController {
+    private final HouseBuildmanageAvageareaService houseBuildmanageAvageareaService;
 
-    public HouseWzBuildmanageAvageareaController(HouseWzBuildmanageAvageareaService houseWzBuildmanageAvageareaService) {
-        this.houseWzBuildmanageAvageareaService = houseWzBuildmanageAvageareaService;
+    public HouseBuildmanageAvageareaController(HouseBuildmanageAvageareaService houseBuildmanageAvageareaService) {
+        this.houseBuildmanageAvageareaService = houseBuildmanageAvageareaService;
     }
 
     @Operation(summary = "查询自有房产人均办公面积")
     @PostMapping("/list")
     public Rsp<PageVo<BuildingOfficeAreaStatVo>> buildingOfficeAreaStat(@Valid @RequestBody BuildingOfficeAreaStatDto dto) {
-        return houseWzBuildmanageAvageareaService.buildingOfficeAreaStat(dto);
+        return houseBuildmanageAvageareaService.buildingOfficeAreaStat(dto);
     }
 
     @Operation(summary = "自有房产人均办公面积导出")
     @GetMapping("/buildingOfficeAreaStatExport")
     public void buildingOfficeAreaStatExport(@Valid BuildingOfficeAreaStatDto.BuildingOfficeAreaStatMapDTO dto) {
-        houseWzBuildmanageAvageareaService.buildingOfficeAreaStatExport(dto);
+        houseBuildmanageAvageareaService.buildingOfficeAreaStatExport(dto);
     }
 }

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

@@ -0,0 +1,43 @@
+package com.example.controller.house;
+
+import com.example.common.PageVo;
+import com.example.common.Rsp;
+import com.example.pojo.dto.ListRentInCompareDto;
+import com.example.pojo.vo.ListRentInCompareVo;
+import com.example.service.house.HouseContractCompareService;
+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.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@Tag(name = "房屋租入")
+@Slf4j
+@RequestMapping("/house-car/house/dist/api/WzHouseContractCompare")
+@RestController
+public class HouseContractCompareController {
+    private final HouseContractCompareService houseContractCompareService;
+
+    public HouseContractCompareController(HouseContractCompareService houseContractCompareService) {
+        this.houseContractCompareService = houseContractCompareService;
+    }
+
+    @Operation(summary = "查询租入单价与平均单价比较")
+    @PostMapping("/list")
+    public Rsp<PageVo<ListRentInCompareVo>> listRentInCompare(@Valid @RequestBody ListRentInCompareDto dto) {
+        return houseContractCompareService.listRentInCompare(dto);
+    }
+
+    @Operation(summary = "租入单价与平均单价比较导出")
+    @GetMapping("/listRentInCompareExport")
+    public void listRentInCompareExport(@Valid ListRentInCompareDto.ListRentInCompareMapDTO dto,
+                                        HttpServletResponse response) {
+        houseContractCompareService.listRentInCompareExport(dto, response);
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.example.controller.house;
+
+import com.example.common.PageVo;
+import com.example.common.Rsp;
+import com.example.pojo.dto.ListRentInContractDto;
+import com.example.pojo.vo.ListRentInContractVo;
+import com.example.service.house.HouseContractInService;
+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.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@Tag(name = "房屋租入")
+@Slf4j
+@RequestMapping("/house-car/house/dist/api/WzHouseContractIn")
+@RestController
+public class HouseContractInController {
+    private final HouseContractInService houseContractInService;
+
+    public HouseContractInController(HouseContractInService houseContractInService) {
+        this.houseContractInService = houseContractInService;
+    }
+
+    @Operation(summary = "查询租入合同记录")
+    @PostMapping("/list")
+    public Rsp<PageVo<ListRentInContractVo>> listRentInContract(@Valid @RequestBody ListRentInContractDto dto) {
+        return houseContractInService.listRentInContract(dto);
+    }
+
+    @Operation(summary = "租入合同记录导出")
+    @GetMapping("/listRentInContractExport")
+    public void listRentInContractExport(@Valid ListRentInContractDto.ListRentInContractMapDTO dto,
+                                         HttpServletResponse response) {
+        houseContractInService.listRentInContractExport(dto, response);
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.example.controller.house;
+
+import com.example.common.PageVo;
+import com.example.common.Rsp;
+import com.example.pojo.dto.ListRentInTopDto;
+import com.example.pojo.vo.ListRentInTopVo;
+import com.example.service.house.HouseContractTopService;
+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.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@Tag(name = "房屋租入")
+@Slf4j
+@RequestMapping("/house-car/house/dist/api/WzHouseContractTop")
+@RestController
+public class HouseContractTopController {
+    private final HouseContractTopService houseContractTopService;
+
+    public HouseContractTopController(HouseContractTopService houseContractTopService) {
+        this.houseContractTopService = houseContractTopService;
+    }
+
+    @Operation(summary = "查询租入房屋单价前10名")
+    @PostMapping("/list")
+    public Rsp<PageVo<ListRentInTopVo>> listRentInTop(@Valid @RequestBody ListRentInTopDto dto) {
+        return houseContractTopService.listRentInTop(dto);
+    }
+
+    @Operation(summary = "租入房屋单价前10名导出")
+    @GetMapping("/listRentInTopExport")
+    public void listRentInTopExport(@Valid ListRentInTopDto.ListRentInTopMapDTO dto, HttpServletResponse response) {
+        houseContractTopService.listRentInTopExport(dto, response);
+    }
+}

src/main/java/com/example/controller/house/HouseWzLandManageDetailsController.java → src/main/java/com/example/controller/house/HouseLandManageDetailsController.java

@@ -8,7 +8,7 @@ import com.example.pojo.dto.ListSiteNameDto;
 import com.example.pojo.dto.ListSiteNumDto;
 import com.example.pojo.vo.LandIdleStatVo;
 import com.example.pojo.vo.ListLandVo;
-import com.example.service.house.HouseWzLandManageDetailsService;
+import com.example.service.house.HouseLandManageDetailsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,46 +22,46 @@ import javax.validation.Valid;
 @Tag(name = "不动产土地")
 @RestController
 @RequestMapping("/house-car/house/dist/api/WzLandManageDetails")
-public class HouseWzLandManageDetailsController {
-    private final HouseWzLandManageDetailsService houseWzLandManageDetailsService;
+public class HouseLandManageDetailsController {
+    private final HouseLandManageDetailsService houseLandManageDetailsService;
 
-    public HouseWzLandManageDetailsController(HouseWzLandManageDetailsService houseWzLandManageDetailsService) {
-        this.houseWzLandManageDetailsService = houseWzLandManageDetailsService;
+    public HouseLandManageDetailsController(HouseLandManageDetailsService houseLandManageDetailsService) {
+        this.houseLandManageDetailsService = houseLandManageDetailsService;
     }
 
     @Operation(summary = "查询局址别名列表")
     @PostMapping("/getBuildingNameAlias")
     public Rsp<PageVo<String>> listSiteName(@RequestBody ListSiteNameDto dto) {
-        return houseWzLandManageDetailsService.listSiteName(dto);
+        return houseLandManageDetailsService.listSiteName(dto);
     }
 
     @Operation(summary = "查询局址编号列表")
     @PostMapping("/getBuildingNameCode")
     public Rsp<PageVo<String>> listSiteNum(@RequestBody ListSiteNumDto dto) {
-        return houseWzLandManageDetailsService.listSiteNum(dto);
+        return houseLandManageDetailsService.listSiteNum(dto);
     }
 
     @Operation(summary = "查询闲置管理")
     @PostMapping("/list")
     public Rsp<PageVo<LandIdleStatVo>> buildingIdleStat(@Valid @RequestBody LandIdleStatDto dto) {
-        return houseWzLandManageDetailsService.landIdleStat(dto);
+        return houseLandManageDetailsService.landIdleStat(dto);
     }
 
     @Operation(summary = "闲置管理导出")
     @GetMapping("/landIdleStatExport")
     public void landIdleStatExport(@Valid LandIdleStatDto.LandIdleStatMapDTO dto) {
-        houseWzLandManageDetailsService.landIdleStatExport(dto);
+        houseLandManageDetailsService.landIdleStatExport(dto);
     }
 
     @Operation(summary = "查询土地记录")
     @PostMapping("/queryLandDetail")
     public Rsp<PageVo<ListLandVo>> queryLandDetail(@Valid @RequestBody ListLandDto dto) {
-        return houseWzLandManageDetailsService.queryLandDetail(dto);
+        return houseLandManageDetailsService.queryLandDetail(dto);
     }
 
     @Operation(summary = "土地记录导出")
     @GetMapping("/queryLandDetailExport")
     public void queryLandDetailExport(@Valid ListLandDto.ListLandMapDTO dto) {
-        houseWzLandManageDetailsService.queryLandDetailExport(dto);
+        houseLandManageDetailsService.queryLandDetailExport(dto);
     }
 }

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

@@ -0,0 +1,52 @@
+package com.example.controller.house;
+
+import com.example.common.PageVo;
+import com.example.common.Rsp;
+import com.example.pojo.dto.RentInContractStatDto;
+import com.example.pojo.vo.RentInContractStatVo;
+import com.example.service.house.HouseLeaseInConService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+
+@Tag(name = "房屋租入")
+@Slf4j
+@Validated
+@RequestMapping("/house-car/house/dist/api/WzHouseLeaseInCon")
+@RestController
+public class HouseLeaseInConController {
+    private final HouseLeaseInConService houseLeaseInConService;
+
+    public HouseLeaseInConController(HouseLeaseInConService houseLeaseInConService) {
+        this.houseLeaseInConService = houseLeaseInConService;
+    }
+
+    @Operation(summary = "查询租入合同统计")
+    @PostMapping("/echartList")
+    public Rsp<PageVo<RentInContractStatVo>> rentInContractStat(@Valid @RequestBody RentInContractStatDto dto) {
+        return houseLeaseInConService.rentInContractStat(dto);
+    }
+
+    @Operation(summary = "租入合同统计导出")
+    @GetMapping("/rentInContractStatExport")
+    public void rentInContractStatExport(@Valid RentInContractStatDto.RentInContractStatMapDTO dto,
+                                         HttpServletResponse response) {
+        houseLeaseInConService.rentInContractStatExport(dto, response);
+    }
+
+    @GetMapping("/excel")
+    public void excel(Integer statisticalMonth, @NotBlank String name, String city, String county,
+                      HttpServletResponse response) {
+        houseLeaseInConService.excel(statisticalMonth, name, city, county, response);
+    }
+}

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

@@ -16,7 +16,7 @@ import com.example.pojo.vo.ListBuildingHighSporadicRepairVo;
 import com.example.pojo.vo.ListBuildingIdleRepairVo;
 import com.example.pojo.vo.ListBuildingRepairMonthVo;
 import com.example.pojo.vo.ListBuildingSameRepairFrequencyVo;
-import com.example.service.house.HouseWzHouseMaintenaCostService;
+import com.example.service.house.HouseMaintenaCostService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -32,95 +32,95 @@ import javax.validation.Valid;
 @Slf4j
 @RequestMapping("/house-car/house/dist/api/wzHouseMaintenaCost")
 @RestController
-public class HouseWzHouseMaintenaCostController {
-    private final HouseWzHouseMaintenaCostService houseWzHouseMaintenaCostService;
+public class HouseMaintenaCostController {
+    private final HouseMaintenaCostService houseMaintenaCostService;
 
-    public HouseWzHouseMaintenaCostController(HouseWzHouseMaintenaCostService houseWzHouseMaintenaCostService) {
-        this.houseWzHouseMaintenaCostService = houseWzHouseMaintenaCostService;
+    public HouseMaintenaCostController(HouseMaintenaCostService houseMaintenaCostService) {
+        this.houseMaintenaCostService = houseMaintenaCostService;
     }
 
     @Operation(summary = "高总价统计")
     @PostMapping("/queryHighPrice")
     public Rsp<PageVo<ListBuildingHighRepairVo>> queryHighPrice(@Valid @RequestBody ListBuildingHighRepairDto dto) {
-        return houseWzHouseMaintenaCostService.queryHighPrice(dto);
+        return houseMaintenaCostService.queryHighPrice(dto);
     }
 
     @Operation(summary = "高总价统计导出")
     @GetMapping("/queryHighPriceExport")
     public void queryHighPriceExport(@Valid ListBuildingHighRepairDto.ListBuildingHighRepairMapDTO dto) {
-        houseWzHouseMaintenaCostService.queryHighPriceExport(dto);
+        houseMaintenaCostService.queryHighPriceExport(dto);
     }
 
     @Operation(summary = "相同维修频次统计")
     @PostMapping("/queryHighFrequency")
     public Rsp<PageVo<ListBuildingSameRepairFrequencyVo>> queryHighFrequency(
             @Valid @RequestBody ListBuildingSameRepairFrequencyDto dto) {
-        return houseWzHouseMaintenaCostService.queryHighFrequency(dto);
+        return houseMaintenaCostService.queryHighFrequency(dto);
     }
 
     @Operation(summary = "相同维修频次统计导出")
     @GetMapping("/queryHighFrequencyExport")
     public void queryHighFrequencyExport(@Valid ListBuildingSameRepairFrequencyDto.ListBuildingSameRepairFrequencyMapDTO dto) {
-        houseWzHouseMaintenaCostService.queryHighFrequencyExport(dto);
+        houseMaintenaCostService.queryHighFrequencyExport(dto);
     }
 
     @Operation(summary = "高额日常零星维修")
     @PostMapping("/queryDailyModify")
     public Rsp<PageVo<ListBuildingHighSporadicRepairVo>> queryDailyModify(@Valid @RequestBody ListBuildingHighSporadicRepairDto dto) {
-        return houseWzHouseMaintenaCostService.queryDailyModify(dto);
+        return houseMaintenaCostService.queryDailyModify(dto);
     }
 
     @Operation(summary = "高额日常零星维修导出")
     @GetMapping("/queryDailyModifyExport")
     public void queryDailyModifyExport(@Valid ListBuildingHighSporadicRepairDto.ListBuildingHighSporadicRepairMapDTO dto) {
-        houseWzHouseMaintenaCostService.queryDailyModifyExport(dto);
+        houseMaintenaCostService.queryDailyModifyExport(dto);
     }
 
     @Operation(summary = "查询局址别名列表")
     @PostMapping("/getBuildingNameAlias")
     public Rsp<PageVo<String>> listSiteName(@RequestBody ListSiteNameDto dto) {
-        return houseWzHouseMaintenaCostService.listSiteName(dto);
+        return houseMaintenaCostService.listSiteName(dto);
     }
 
     @Operation(summary = "查询局址编号列表")
     @PostMapping("/getBuildingNameCode")
     public Rsp<PageVo<String>> listSiteNum(@RequestBody ListSiteNumDto dto) {
-        return houseWzHouseMaintenaCostService.listSiteNum(dto);
+        return houseMaintenaCostService.listSiteNum(dto);
     }
 
     @Operation(summary = "闲置不可用发生维修费")
     @PostMapping("/list")
     public Rsp<PageVo<ListBuildingIdleRepairVo>> listBuildingIdleRepair(@Valid @RequestBody ListBuildingIdleRepairDto dto) {
-        return houseWzHouseMaintenaCostService.listBuildingIdleRepair(dto);
+        return houseMaintenaCostService.listBuildingIdleRepair(dto);
     }
 
     @Operation(summary = "闲置不可用发生维修费导出")
     @GetMapping("/buildingIdleRepairExport")
     public void buildingIdleRepairExport(@Valid ListBuildingIdleRepairDto.ListBuildingIdleRepairDTO dto) {
-        houseWzHouseMaintenaCostService.buildingIdleRepairExport(dto);
+        houseMaintenaCostService.buildingIdleRepairExport(dto);
     }
 
     @Operation(summary = "查询维修费统计")
     @PostMapping("/queryEchart")
     public Rsp<PageVo<BuildingRepairStatVo>> buildingRepairStat(@Valid @RequestBody BuildingRepairStatDto dto) {
-        return houseWzHouseMaintenaCostService.buildingRepairStat(dto);
+        return houseMaintenaCostService.buildingRepairStat(dto);
     }
 
     @Operation(summary = "维修费统计导出")
     @GetMapping("/buildingRepairStatExport")
     public void buildingRepairStatExport(@Valid BuildingRepairStatDto.BuildingRepairStatMapDTO dto) {
-        houseWzHouseMaintenaCostService.buildingRepairStatExport(dto);
+        houseMaintenaCostService.buildingRepairStatExport(dto);
     }
 
     @Operation(summary = "查询维修费记录")
     @PostMapping("/list1")
     public Rsp<PageVo<ListBuildingRepairMonthVo>> listBuildingRepairMonth(@Valid @RequestBody ListBuildingRepairMonthDto dto) {
-        return houseWzHouseMaintenaCostService.listBuildingRepairMonth(dto);
+        return houseMaintenaCostService.listBuildingRepairMonth(dto);
     }
 
     @Operation(summary = "维修费记录导出")
     @GetMapping("/listBuildingRepairMonthExport")
     public void listBuildingRepairMonthExport(@Valid ListBuildingRepairMonthDto.ListBuildingRepairMonthMapDTO dto) {
-        houseWzHouseMaintenaCostService.listBuildingRepairMonthExport(dto);
+        houseMaintenaCostService.listBuildingRepairMonthExport(dto);
     }
 }

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

@@ -6,7 +6,7 @@ import com.example.pojo.dto.ListSiteNameDto;
 import com.example.pojo.dto.ListSiteNumDto;
 import com.example.pojo.vo.ListSiteNameVo;
 import com.example.pojo.vo.ListSiteNumVo;
-import com.example.service.house.HouseWzOtnAreaService;
+import com.example.service.house.HouseOtnAreaService;
 import com.example.utils.R;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,28 +23,28 @@ import javax.validation.Valid;
 @Slf4j
 @RequestMapping("/house-car/house/dist/api/wzOtnArea")
 @RestController
-public class HouseWzOtnAreaController {
-    private final HouseWzOtnAreaService houseWzOtnAreaService;
+public class HouseOtnAreaController {
+    private final HouseOtnAreaService houseOtnAreaService;
 
-    public HouseWzOtnAreaController(HouseWzOtnAreaService houseWzOtnAreaService) {
-        this.houseWzOtnAreaService = houseWzOtnAreaService;
+    public HouseOtnAreaController(HouseOtnAreaService houseOtnAreaService) {
+        this.houseOtnAreaService = houseOtnAreaService;
     }
 
     @Operation(summary = "根据父级组织机构id查询子组织机构列表")
     @PostMapping("/getCityOption/{id}")
     public R getCityOption(@PathVariable("id") String id) {
-        return houseWzOtnAreaService.getCityOption(id);
+        return houseOtnAreaService.getCityOption(id);
     }
 
     @Operation(summary = "查询局址别名列表")
     @PostMapping("/listSiteName")
     public Rsp<PageVo<ListSiteNameVo>> listSiteName(@Valid @RequestBody ListSiteNameDto dto) {
-        return houseWzOtnAreaService.listSiteName(dto);
+        return houseOtnAreaService.listSiteName(dto);
     }
 
     @Operation(summary = "查询局址编号列表")
     @PostMapping("/listSiteNum")
     public Rsp<PageVo<ListSiteNumVo>> listSiteNum(@Valid @RequestBody ListSiteNumDto dto) {
-        return houseWzOtnAreaService.listSiteNum(dto);
+        return houseOtnAreaService.listSiteNum(dto);
     }
 }

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

@@ -0,0 +1,43 @@
+package com.example.controller.house;
+
+import com.example.common.PageVo;
+import com.example.common.Rsp;
+import com.example.pojo.dto.RentInUseStatDto;
+import com.example.pojo.vo.RentInUseStatVo;
+import com.example.service.house.HouseUseService;
+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.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+
+@Tag(name = "房屋租入")
+@Slf4j
+@RequestMapping("/house-car/house/dist/api/WzHouseUse")
+@RestController
+public class HouseUseController {
+    private final HouseUseService houseUseService;
+
+    public HouseUseController(HouseUseService houseUseService) {
+        this.houseUseService = houseUseService;
+    }
+
+    @Operation(summary = "查询租入用途管理")
+    @PostMapping("/echartList")
+    public Rsp<PageVo<RentInUseStatVo>> rentInUseStat(@Valid @RequestBody RentInUseStatDto dto) {
+        return houseUseService.rentInUseStat(dto);
+    }
+
+    @Operation(summary = "租入用途管理导出")
+    @GetMapping("/rentInUseStatExport")
+    public void rentInUseStatExport(@Valid RentInUseStatDto.RentInUseStatMapDTO dto, HttpServletResponse response) {
+        houseUseService.rentInUseStatExport(dto, response);
+    }
+}

src/main/java/com/example/dao/common/RequestLogDao.java

@@ -1,7 +1,7 @@
 package com.example.dao.common;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.example.entity.common.RequestLogPo;
+import com.example.pojo.po.common.RequestLogPo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;
 

src/main/java/com/example/dao/WzBuildManageDetailsDao.java → src/main/java/com/example/dao/gdc/WzBuildManageDetailsDao.java

@@ -1,10 +1,10 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzBuildManageDetailsEntity;
-import com.example.entity.vo.BuildManageVo;
-import com.example.entity.vo.housemanager.LeaveUseVo;
-import com.example.entity.vo.housemanager.WzBuildmanageAvageareaVo;
+import com.example.pojo.gdc.WzBuildManageDetailsEntity;
+import com.example.pojo.gdc.vo.BuildManageVo;
+import com.example.pojo.gdc.vo.housemanager.LeaveUseVo;
+import com.example.pojo.gdc.vo.housemanager.WzBuildmanageAvageareaVo;
 import com.example.utils.Query;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/example/dao/WzBuildmanageAvageareaDao.java → src/main/java/com/example/dao/gdc/WzBuildmanageAvageareaDao.java

@@ -1,8 +1,8 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzBuildmanageAvageareaEntity;
-import com.example.entity.vo.housemanager.WzBuildmanageAvageareaVo;
+import com.example.pojo.gdc.WzBuildmanageAvageareaEntity;
+import com.example.pojo.gdc.vo.housemanager.WzBuildmanageAvageareaVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/example/dao/WzDataInspectionDao.java → src/main/java/com/example/dao/gdc/WzDataInspectionDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzDataInspectionEntity;
+import com.example.pojo.gdc.WzDataInspectionEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzHouseArrearsManageDao.java → src/main/java/com/example/dao/gdc/WzHouseArrearsManageDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseArrearsManageEntity;
+import com.example.pojo.gdc.WzHouseArrearsManageEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzHouseContracDao.java → src/main/java/com/example/dao/gdc/WzHouseContracDao.java

@@ -1,8 +1,8 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseContracEntity;
-import com.example.entity.vo.houserent.WzHouseContractVo;
+import com.example.pojo.gdc.WzHouseContracEntity;
+import com.example.pojo.gdc.vo.houserent.WzHouseContractVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/example/dao/WzHouseContractCompareDao.java → src/main/java/com/example/dao/gdc/WzHouseContractCompareDao.java

@@ -1,8 +1,8 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseContractCompareEntity;
-import com.example.entity.vo.houserent.WzHouseContractVo;
+import com.example.pojo.gdc.WzHouseContractCompareEntity;
+import com.example.pojo.gdc.vo.houserent.WzHouseContractVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/example/dao/WzHouseContractInDao.java → src/main/java/com/example/dao/gdc/WzHouseContractInDao.java

@@ -1,8 +1,8 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseContractInEntity;
-import com.example.entity.vo.houserent.WzHouseContractVo;
+import com.example.pojo.gdc.WzHouseContractInEntity;
+import com.example.pojo.gdc.vo.houserent.WzHouseContractVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/example/dao/WzHouseContractOutDao.java → src/main/java/com/example/dao/gdc/WzHouseContractOutDao.java

@@ -1,8 +1,8 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseContractOutEntity;
-import com.example.entity.vo.houserent.WzHouseContractVo;
+import com.example.pojo.gdc.WzHouseContractOutEntity;
+import com.example.pojo.gdc.vo.houserent.WzHouseContractVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/example/dao/WzHouseContractTopDao.java → src/main/java/com/example/dao/gdc/WzHouseContractTopDao.java

@@ -1,8 +1,8 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseContractTopEntity;
-import com.example.entity.vo.houserent.WzHouseContractVo;
+import com.example.pojo.gdc.WzHouseContractTopEntity;
+import com.example.pojo.gdc.vo.houserent.WzHouseContractVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/example/dao/WzHouseCustomerDao.java → src/main/java/com/example/dao/gdc/WzHouseCustomerDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseCustomerEntity;
+import com.example.pojo.gdc.WzHouseCustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzHouseInCustomerDao.java → src/main/java/com/example/dao/gdc/WzHouseInCustomerDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseInCustomerEntity;
+import com.example.pojo.gdc.WzHouseInCustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzHouseLeaseInConDao.java → src/main/java/com/example/dao/gdc/WzHouseLeaseInConDao.java

@@ -1,8 +1,8 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseLeaseInConEntity;
-import com.example.entity.vo.houserent.WzHouseContractVo;
+import com.example.pojo.gdc.WzHouseLeaseInConEntity;
+import com.example.pojo.gdc.vo.houserent.WzHouseContractVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/example/dao/WzHouseMaintDao.java → src/main/java/com/example/dao/gdc/WzHouseMaintDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseMaintEntity;
+import com.example.pojo.gdc.WzHouseMaintEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

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

@@ -1,9 +1,9 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseMaintenaCostEntity;
-import com.example.entity.vo.DailyModifyVo;
-import com.example.entity.vo.HighFrequencyVo;
+import com.example.pojo.gdc.WzHouseMaintenaCostEntity;
+import com.example.pojo.gdc.vo.DailyModifyVo;
+import com.example.pojo.gdc.vo.HighFrequencyVo;
 import com.example.utils.Query;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

src/main/java/com/example/dao/WzHouseMarketDao.java → src/main/java/com/example/dao/gdc/WzHouseMarketDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseMarketEntity;
+import com.example.pojo.gdc.WzHouseMarketEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzHouseUseDao.java → src/main/java/com/example/dao/gdc/WzHouseUseDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzHouseUseEntity;
+import com.example.pojo.gdc.WzHouseUseEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzLandManageDetailsDao.java → src/main/java/com/example/dao/gdc/WzLandManageDetailsDao.java

@@ -1,9 +1,9 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzLandManageDetailsEntity;
-import com.example.entity.vo.floormanager.FloorNoUserVo;
-import com.example.entity.vo.housemanager.WzBuildmanageAvageareaVo;
+import com.example.pojo.gdc.WzLandManageDetailsEntity;
+import com.example.pojo.gdc.vo.floormanager.FloorNoUserVo;
+import com.example.pojo.gdc.vo.housemanager.WzBuildmanageAvageareaVo;
 import com.example.utils.Query;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/example/dao/WzLowestUnitPriceDao.java → src/main/java/com/example/dao/gdc/WzLowestUnitPriceDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzLowestUnitPriceEntity;
+import com.example.pojo.gdc.WzLowestUnitPriceEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

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

@@ -1,9 +1,9 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.house.HouseSitePo;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.po.house.HouseSitePo;
 import com.example.pojo.bo.ListHouseSiteBo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/example/dao/WzRemarkDao.java → src/main/java/com/example/dao/gdc/WzRemarkDao.java

@@ -1,8 +1,8 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzRemarkEntity;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzRemarkEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzRentHouseArrearsDao.java → src/main/java/com/example/dao/gdc/WzRentHouseArrearsDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzRentHouseArrearsEntity;
+import com.example.pojo.gdc.WzRentHouseArrearsEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzRentThreeMonthDao.java → src/main/java/com/example/dao/gdc/WzRentThreeMonthDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzRentThrMonthEntity;
+import com.example.pojo.gdc.WzRentThrMonthEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzScoreRankingDao.java → src/main/java/com/example/dao/gdc/WzScoreRankingDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzScoreRankingEntity;
+import com.example.pojo.gdc.WzScoreRankingEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzStrategyDao.java → src/main/java/com/example/dao/gdc/WzStrategyDao.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.WzStrategyEntity;
+import com.example.pojo.gdc.WzStrategyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/example/dao/WzUserDao.java → src/main/java/com/example/dao/gdc/WzUserDao.java

@@ -1,8 +1,8 @@
-package com.example.dao;
+package com.example.dao.gdc;
 
 import com.example.config.mybatis.ex.method.ExBaseMapper;
-import com.example.entity.OtnAreaEntity;
-import com.example.entity.WzUserEntity;
+import com.example.pojo.gdc.OtnAreaEntity;
+import com.example.pojo.gdc.WzUserEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

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

@@ -1,10 +1,10 @@
 package com.example.dao.house;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.entity.house.BuildingIdleStatPo;
-import com.example.entity.house.BuildingOfficeAreaStatPo;
-import com.example.entity.house.HouseAgeStatPo;
-import com.example.entity.house.HouseBuildingPo;
+import com.example.pojo.po.house.BuildingIdleStatPo;
+import com.example.pojo.po.house.BuildingOfficeAreaStatPo;
+import com.example.pojo.po.house.HouseAgeStatPo;
+import com.example.pojo.po.house.HouseBuildingPo;
 import com.example.pojo.bo.BuildingIdleStatBo;
 import com.example.pojo.bo.BuildingOfficeAreaStatBo;
 import com.example.pojo.bo.HouseAgeStatBo;

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

@@ -1,8 +1,8 @@
 package com.example.dao.house;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.entity.house.BuildingRepairMonthPo;
-import com.example.entity.house.BuildingRepairStatPo;
+import com.example.pojo.po.house.BuildingRepairMonthPo;
+import com.example.pojo.po.house.BuildingRepairStatPo;
 import com.example.pojo.bo.BuildingRepairStatBo;
 import com.example.pojo.bo.ListBuildingRepairMonthBo;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -1,8 +1,8 @@
 package com.example.dao.house;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.entity.house.HouseLandPo;
-import com.example.entity.house.LandIdleStatPo;
+import com.example.pojo.po.house.HouseLandPo;
+import com.example.pojo.po.house.LandIdleStatPo;
 import com.example.pojo.bo.LandIdleStatBo;
 import com.example.pojo.bo.ListLandBo;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -0,0 +1,331 @@
+package com.example.dao.house;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.pojo.bo.ListRentInCompareBo;
+import com.example.pojo.bo.ListRentInContractBo;
+import com.example.pojo.bo.ListRentInTopBo;
+import com.example.pojo.bo.RentInContractStatBo;
+import com.example.pojo.bo.RentInUseStatBo;
+import com.example.pojo.po.house.ListRentInComparePo;
+import com.example.pojo.po.house.RentInContractStatPo;
+import com.example.pojo.po.house.RentInMonthPo;
+import com.example.pojo.po.house.RentInUseStatPo;
+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 HouseRentInDao {
+    @Select("""
+<script>
+with
+t101 as (
+select
+    area_no,
+    city_no,
+    count(1) as total,
+    sum(gross_amount_month) * 12 as gross_amount_year,
+    round(avg(unit_price),
+    2) as unit_price_avg,
+    round(sum(case when use_type = '营业' then building_area else 0 end),
+    2) as yy,
+    round(sum(case when use_type = '办公' then building_area else 0 end),
+    2) as bg,
+    round(sum(case when use_type = '通信设施机房' then building_area else 0 end),
+    2) as tx,
+    round(sum(case when use_type = '其他租入用途' then building_area else 0 end),
+    2) as qt,
+    round(sum(case when use_type in ('营业', '办公', '通信设施机房', '其他租入用途') then building_area else 0 end),
+    2) as zj
+from
+    house.rent_in_month
+where
+    contract_status = '履行中'
+<choose>
+  <when test="dto.yearMonth != null">
+    and year_month = #{dto.yearMonth}
+  </when>
+  <otherwise>
+    and year_month = (select max(year_month) from house.rent_in_month)
+  </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>
+group by
+    area_no,
+    city_no
+),
+t102 as (
+select
+    b.id as area_no,
+    b."name" as area_name,
+    a.id as city_no,
+    a."name" as city_name,
+    coalesce(c.total,
+    0) as total,
+    coalesce(c.gross_amount_year,
+    0) as gross_amount_year,
+    coalesce(c.unit_price_avg,
+    0) as unit_price_avg,
+    coalesce(c.yy,
+    0) as yy,
+    coalesce(c.bg,
+    0) as bg,
+    coalesce(c.tx,
+    0) as tx,
+    coalesce(c.qt,
+    0) as qt,
+    coalesce(c.zj,
+    0) as zj
+from
+    common.organization a
+left join common.organization b on
+    a.parent_id = b.id
+left join t101 c on
+    a.id = c.city_no
+where
+    a.grade = 2
+    and a.unhide = 1
+<if test="dto.areaNo != null and dto.areaNo != ''">
+  and a.parent_id = #{dto.areaNo}
+</if>
+<if test="dto.cityNo != null and dto.cityNo != ''">
+  and a.id = #{dto.cityNo}
+</if>
+order by
+    b.order_num,
+    a.order_num
+)
+select
+    *
+from
+    t102
+</script>
+""")
+    List<RentInContractStatPo> rentInContractStat(@Param("dto") RentInContractStatBo dto);
+
+    /**
+     * 查询租入合同
+     */
+    @Select("""
+<script>
+select
+*
+from house.rent_in_month
+where contract_status = '履行中'
+<choose>
+  <when test="dto.yearMonth != null">
+    and year_month = #{dto.yearMonth}
+  </when>
+  <otherwise>
+    and year_month = (select max(year_month) from house.rent_in_month)
+  </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>
+</script>
+""")
+    List<RentInMonthPo> listRentInContract(Page<RentInMonthPo> page, @Param("dto") ListRentInContractBo dto);
+
+    @Select("""
+<script>
+with
+t101 as (
+select
+    area_no,
+    city_no,
+    count(use_type = '营业' or null) as yy,
+    count(use_type = '办公' or null) as bg,
+    count(use_type = '通信设施机房' or null) as tx,
+    count(use_type in ('营业', '办公', '通信设施机房', '其他租入用途') or null) as qt,
+    count(1) as zj
+from
+    house.rent_in_month
+where
+    contract_status = '履行中'
+<choose>
+  <when test="dto.yearMonth != null">
+    and year_month = #{dto.yearMonth}
+  </when>
+  <otherwise>
+    and year_month = (select max(year_month) from house.rent_in_month)
+  </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>
+group by
+    area_no,
+    city_no
+),
+t102 as (
+select
+    b.id as area_no,
+    b."name" as area_name,
+    a.id as city_no,
+    a."name" as city_name,
+    coalesce(c.yy,
+    0) as yy,
+    coalesce(c.bg,
+    0) as bg,
+    coalesce(c.tx,
+    0) as tx,
+    coalesce(c.qt,
+    0) as qt,
+    coalesce(c.zj,
+    0) as zj
+from
+    common.organization a
+left join common.organization b on
+    a.parent_id = b.id
+left join t101 c on
+    a.id = c.city_no
+where
+    a.grade = 2
+    and a.unhide = 1
+<if test="dto.areaNo != null and dto.areaNo != ''">
+  and a.parent_id = #{dto.areaNo}
+</if>
+<if test="dto.cityNo != null and dto.cityNo != ''">
+  and a.id = #{dto.cityNo}
+</if>
+order by
+    b.order_num,
+    a.order_num
+)
+select
+    *
+from
+    t102
+</script>
+""")
+    List<RentInUseStatPo> rentInUseStat(@Param("dto") RentInUseStatBo dto);
+
+    /**
+     * 查询租入合同
+     */
+    @Select("""
+<script>
+with
+t101 as (
+select
+    *
+from
+    house.rent_in_month
+where
+    contract_status = '履行中'
+<choose>
+  <when test="dto.yearMonth != null">
+    and year_month = #{dto.yearMonth}
+  </when>
+  <otherwise>
+    and year_month = (select max(year_month) from house.rent_in_month)
+  </otherwise>
+</choose>
+order by
+    unit_price desc nulls last
+limit 10
+)
+select * from t101
+<where>
+  <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<RentInMonthPo> listRentInTop(Page<RentInMonthPo> page, @Param("dto") ListRentInTopBo dto);
+
+    /**
+     * 查询租入单价与平均单价比较
+     */
+    @Select("""
+<script>
+with
+t101 as (
+select
+    use_type,
+    round(avg(unit_price),
+    2) as unit_price_avg
+from
+    house.rent_in_month
+where
+    contract_status = '履行中'
+<choose>
+  <when test="dto.yearMonth != null">
+    and year_month = #{dto.yearMonth}
+  </when>
+  <otherwise>
+    and year_month = (select max(year_month) from house.rent_in_month)
+  </otherwise>
+</choose>
+group by
+    use_type
+),
+t102 as (
+select
+    a.contract_no,
+    a.contract_name,
+    a.area_name,
+    a.city_name,
+    a.field,
+    a.use_type,
+    a.use_description,
+    a.city_region,
+    a.area_sector,
+    a.gross_amount,
+    a.building_area,
+    a.rent_months,
+    a.rent_years,
+    a.unit_price,
+    b.unit_price_avg,
+    case
+        when b.unit_price_avg = 0 then null
+        else round(a.unit_price / b.unit_price_avg,
+        2)
+    end as unit_price_compare
+from
+    house.rent_in_month a
+left join t101 b on
+    a.use_type = b.use_type
+where
+    a.contract_status = '履行中'
+<choose>
+  <when test="dto.yearMonth != null">
+    and a.year_month = #{dto.yearMonth}
+  </when>
+  <otherwise>
+    and a.year_month = (select max(year_month) from house.rent_in_month)
+  </otherwise>
+</choose>
+<if test="dto.areaNo != null and dto.areaNo != ''">
+  and a.area_no = #{dto.areaNo}
+</if>
+<if test="dto.cityNo != null and dto.cityNo != ''">
+  and a.city_no = #{dto.cityNo}
+</if>
+)
+select
+    *
+from
+    t102
+</script>
+""")
+    List<ListRentInComparePo> listRentInCompare(Page<ListRentInComparePo> page, @Param("dto") ListRentInCompareBo dto);
+}

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

@@ -1,10 +1,10 @@
 package com.example.dao.house;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.entity.house.HouseBuildingHighRepairPo;
-import com.example.entity.house.HouseBuildingHighSporadicRepairPo;
-import com.example.entity.house.HouseBuildingIdleRepairPo;
-import com.example.entity.house.HouseBuildingSameRepairFrequencyPo;
+import com.example.pojo.po.house.HouseBuildingHighRepairPo;
+import com.example.pojo.po.house.HouseBuildingHighSporadicRepairPo;
+import com.example.pojo.po.house.HouseBuildingIdleRepairPo;
+import com.example.pojo.po.house.HouseBuildingSameRepairFrequencyPo;
 import com.example.pojo.bo.ListBuildingHighRepairBo;
 import com.example.pojo.bo.ListBuildingHighSporadicRepairBo;
 import com.example.pojo.bo.ListBuildingIdleRepairBo;

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

@@ -1,10 +1,10 @@
 package com.example.dao.house;
 
-import com.example.entity.house.HouseBuildingPo;
-import com.example.entity.house.HouseSiteBuildingAreaIdleDiffPo;
-import com.example.entity.house.HouseSitePo;
-import com.example.entity.house.HouseSiteRepairInvestorStatPo;
-import com.example.entity.house.HouseSiteRepairMonthPo;
+import com.example.pojo.po.house.HouseBuildingPo;
+import com.example.pojo.po.house.HouseSiteBuildingAreaIdleDiffPo;
+import com.example.pojo.po.house.HouseSitePo;
+import com.example.pojo.po.house.HouseSiteRepairInvestorStatPo;
+import com.example.pojo.po.house.HouseSiteRepairMonthPo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

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

@@ -0,0 +1,75 @@
+package com.example.enums;
+
+public enum ListRentInCompareOrderEnum {
+    /**
+     * 使用单位隶属的地市级公司
+     */
+    city("area_name"),
+    /**
+     * 使用单位隶属的区县级公司
+     */
+    county("city_name"),
+    /**
+     * 使用专业线
+     */
+    useTheProLine("field"),
+    /**
+     * 租入实际用途
+     */
+    leaseInPracticalUse("use_type"),
+    /**
+     * 租入其他用途说明
+     */
+    descriptionOfOtherUsesOfTheLease("use_description"),
+    /**
+     * 城市区域
+     */
+    cityArea("city_region"),
+    /**
+     * 地段
+     */
+    district("area_sector"),
+    /**
+     * 合同总金额
+     */
+    contractAmountIncludingTax("gross_amount"),
+    /**
+     * 租入建筑面积
+     */
+    rentalBuildingArea("building_area"),
+    /**
+     * 租期
+     */
+    hireTime("rent_months"),
+    /**
+     * 每平米月租金
+     */
+    totalMonthlyRent("unit_price"),
+    /**
+     * 分用途全省平均值
+     */
+    ftProvinceAverage("unit_price_avg"),
+    /**
+     * 每平米单价与全省单价平均值比较
+     */
+    priceProvinceAverage("unit_price_compare"),
+    /**
+     * 合同编号
+     */
+    contractNumber("contract_no"),
+    /**
+     * 合同名称
+     */
+    contractName("contract_name"),
+    ;
+
+    private final String columnName;
+
+    ListRentInCompareOrderEnum(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+}

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

@@ -0,0 +1,163 @@
+package com.example.enums;
+
+public enum ListRentInContractOrderEnum {
+    /**
+     * 导入时间
+     */
+    importTime("import_time"),
+    /**
+     * 房屋所有权人属性
+     */
+    ownershipOTheProperty("owner_type"),
+    /**
+     * 租入房屋名称
+     */
+    theNameOfTheRentedProperty("house_name"),
+    /**
+     * 租入形式
+     */
+    formOfLease("rent_type"),
+    /**
+     * 标准地址一级
+     */
+    standardAddressLevel_1("first_address"),
+    /**
+     * 标准地址二级
+     */
+    standardAddressLevel_2("second_address"),
+    /**
+     * 标准地址三级
+     */
+    standardAddressLevel_3("third_address"),
+    /**
+     * 街路村门牌号
+     */
+    houseNumber("fourth_address"),
+    /**
+     * 城市区域
+     */
+    cityArea("city_region"),
+    /**
+     * 地段
+     */
+    district("area_sector"),
+    /**
+     * 经度
+     */
+    buildingLongitude("lng"),
+    /**
+     * 纬度
+     */
+    buildingDimension("lat"),
+    /**
+     * 租入建筑面积
+     */
+    rentalBuildingArea("building_area"),
+    /**
+     * 租入使用面积
+     */
+    rentalUsableArea("usable_area"),
+    /**
+     * 投资主体
+     */
+    investmentEntities("investor"),
+    /**
+     * 使用单位层级
+     */
+    useTheUnitsHierarchy("unit_level"),
+    /**
+     * 使用单位隶属的省级公司
+     */
+    province("first_unit"),
+    /**
+     * 使用单位隶属的地市级公司
+     */
+    city("area_name"),
+    /**
+     * 使用单位隶属的区县级公司
+     */
+    county("city_name"),
+    /**
+     * 使用专业线
+     */
+    useTheProLine("field"),
+    /**
+     * 租入实际用途
+     */
+    leaseInPracticalUse("use_type"),
+    /**
+     * 租入其他用途说明
+     */
+    descriptionOfOtherUsesOfTheLease("use_description"),
+    /**
+     * 自用建筑面积
+     */
+    selfUseBuildingArea("building_area_self_use"),
+    /**
+     * 转租建筑面积
+     */
+    subleaseBuildingArea("building_area_sublet"),
+    /**
+     * 首次租用时间
+     */
+    firstHireTime("first_rent_date"),
+    /**
+     * 联系电话
+     */
+    contactNumber("phone"),
+    /**
+     * 合同编号
+     */
+    contractNumber("contract_no"),
+    /**
+     * 合同名称
+     */
+    contractName("contract_name"),
+    /**
+     * 合同类型
+     */
+    contractType("contract_type"),
+    /**
+     * 签订时间
+     */
+    signTime("sign_date"),
+    /**
+     * 我方签约主体
+     */
+    ourContractingEntity("lessee"),
+    /**
+     * 出租方名称
+     */
+    lessorName("lessor"),
+    /**
+     * 合同总金额
+     */
+    contractAmountIncludingTax("gross_amount"),
+    /**
+     * 增值税金额
+     */
+    valueAddedTaxAmount("vat"),
+    /**
+     * 租入开始时间
+     */
+    effectiveTimeOfContract("rent_start_date"),
+    /**
+     * 租入终止时间
+     */
+    terminationTimeOfContract("rent_end_date"),
+    /**
+     * 承办部门
+     */
+    undertakingDepartment("undertaking_department"),
+    ;
+
+    private final String columnName;
+
+    ListRentInContractOrderEnum(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.example.enums;
+
+public enum ListRentInTopOrderEnum {
+    /**
+     * 使用单位隶属的省级公司
+     */
+    province("first_unit"),
+    /**
+     * 使用单位隶属的地市级公司
+     */
+    city("area_name"),
+    /**
+     * 使用单位隶属的区县级公司
+     */
+    county("city_name"),
+    /**
+     * 使用专业线
+     */
+    useTheProLine("field"),
+    /**
+     * 租入实际用途
+     */
+    leaseInPracticalUse("use_type"),
+    /**
+     * 租入其他用途说明
+     */
+    descriptionOfOtherUsesOfTheLease("use_description"),
+    /**
+     * 城市区域
+     */
+    cityArea("city_region"),
+    /**
+     * 地段
+     */
+    district("area_sector"),
+    /**
+     * 合同总金额
+     */
+    contractAmountIncludingTax("gross_amount"),
+    /**
+     * 租入建筑面积
+     */
+    rentalBuildingArea("building_area"),
+    /**
+     * 租期
+     */
+    hireTime("rent_months"),
+    /**
+     * 每平米月租金
+     */
+    totalMonthlyRent("unit_price"),
+    /**
+     * 合同编号
+     */
+    contractNumber("contract_no"),
+    /**
+     * 合同名称
+     */
+    contractName("contract_name"),
+    ;
+
+    private final String columnName;
+
+    ListRentInTopOrderEnum(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.example.pojo.bo;
+
+import lombok.Data;
+
+@Data
+public class ListRentInCompareBo {
+    /**
+     * 账期
+     */
+    private Integer yearMonth;
+    /**
+     * 二级组织机构编码
+     */
+    private String areaNo;
+    /**
+     * 三级组织机构编码
+     */
+    private String cityNo;
+}

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

@@ -0,0 +1,19 @@
+package com.example.pojo.bo;
+
+import lombok.Data;
+
+@Data
+public class ListRentInContractBo {
+    /**
+     * 账期
+     */
+    private Integer yearMonth;
+    /**
+     * 二级组织机构编码
+     */
+    private String areaNo;
+    /**
+     * 三级组织机构编码
+     */
+    private String cityNo;
+}

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

@@ -0,0 +1,19 @@
+package com.example.pojo.bo;
+
+import lombok.Data;
+
+@Data
+public class ListRentInTopBo {
+    /**
+     * 账期
+     */
+    private Integer yearMonth;
+    /**
+     * 二级组织机构编码
+     */
+    private String areaNo;
+    /**
+     * 三级组织机构编码
+     */
+    private String cityNo;
+}

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

@@ -0,0 +1,19 @@
+package com.example.pojo.bo;
+
+import lombok.Data;
+
+@Data
+public class RentInContractStatBo {
+    /**
+     * 账期
+     */
+    private Integer yearMonth;
+    /**
+     * 二级组织机构编码
+     */
+    private String areaNo;
+    /**
+     * 三级组织机构编码
+     */
+    private String cityNo;
+}

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

@@ -0,0 +1,19 @@
+package com.example.pojo.bo;
+
+import lombok.Data;
+
+@Data
+public class RentInUseStatBo {
+    /**
+     * 账期
+     */
+    private Integer yearMonth;
+    /**
+     * 二级组织机构编码
+     */
+    private String areaNo;
+    /**
+     * 三级组织机构编码
+     */
+    private String cityNo;
+}

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

@@ -0,0 +1,59 @@
+package com.example.pojo.dto;
+
+import com.example.enums.ListRentInCompareOrderEnum;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+
+@Slf4j
+@NoArgsConstructor
+@Data
+public class ListRentInCompareDto {
+    @Valid
+    @NotNull
+    private Page page;
+    @Valid
+    private ListRentInCompareMapDTO map;
+
+    @Data
+    public static class ListRentInCompareMapDTO {
+        @Schema(description = "账期", example = "202312")
+        private Integer statisticalMonth;
+        @Schema(description = "二级组织机构id")
+        private String city;
+        @Schema(description = "三级级组织机构id")
+        private String county;
+        @Schema(description = "排序方式", example = "desc")
+        private OrderEnum order;
+        @Schema(description = "排序字段", example = "totalMonthlyRent")
+        private String sidx;
+
+        public ListRentInCompareOrderEnum getOrderColumn() {
+            try {
+                return ListRentInCompareOrderEnum.valueOf(sidx);
+            } catch (Exception e) {
+                log.warn(e.getMessage());
+                return ListRentInCompareOrderEnum.totalMonthlyRent;
+            }
+        }
+    }
+
+    public ListRentInCompareDto(ListRentInCompareMapDTO map) {
+        if (StringUtils.hasText(map.city)) {
+            map.city = URLDecoder.decode(map.city, StandardCharsets.UTF_8);
+        }
+        if (StringUtils.hasText(map.county)) {
+            map.county = URLDecoder.decode(map.county, StandardCharsets.UTF_8);
+        }
+        this.map = map;
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.example.pojo.dto;
+
+import com.example.enums.ListRentInContractOrderEnum;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+
+@Slf4j
+@NoArgsConstructor
+@Data
+public class ListRentInContractDto {
+    @Valid
+    @NotNull
+    private Page page;
+    @Valid
+    private ListRentInContractMapDTO map;
+
+    @Data
+    public static class ListRentInContractMapDTO {
+        @Schema(description = "账期", example = "202312")
+        private Integer statisticalMonth;
+        @Schema(description = "二级组织机构id")
+        private String city;
+        @Schema(description = "三级级组织机构id")
+        private String county;
+        @Schema(description = "排序方式", example = "desc")
+        private OrderEnum order;
+        @Schema(description = "排序字段", example = "contractAmountIncludingTax")
+        private String sidx;
+
+        public ListRentInContractOrderEnum getOrderColumn() {
+            try {
+                return ListRentInContractOrderEnum.valueOf(sidx);
+            } catch (Exception e) {
+                log.warn(e.getMessage());
+                return ListRentInContractOrderEnum.contractAmountIncludingTax;
+            }
+        }
+    }
+
+    public ListRentInContractDto(ListRentInContractMapDTO map) {
+        if (StringUtils.hasText(map.city)) {
+            map.city = URLDecoder.decode(map.city, StandardCharsets.UTF_8);
+        }
+        if (StringUtils.hasText(map.county)) {
+            map.county = URLDecoder.decode(map.county, StandardCharsets.UTF_8);
+        }
+        this.map = map;
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.example.pojo.dto;
+
+import com.example.enums.ListRentInTopOrderEnum;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+
+@Slf4j
+@NoArgsConstructor
+@Data
+public class ListRentInTopDto {
+    @Valid
+    @NotNull
+    private Page page;
+    @Valid
+    private ListRentInTopMapDTO map;
+
+    @Data
+    public static class ListRentInTopMapDTO {
+        @Schema(description = "账期", example = "202312")
+        private Integer statisticalMonth;
+        @Schema(description = "二级组织机构id")
+        private String city;
+        @Schema(description = "三级级组织机构id")
+        private String county;
+        @Schema(description = "排序方式", example = "desc")
+        private OrderEnum order;
+        @Schema(description = "排序字段", example = "totalMonthlyRent")
+        private String sidx;
+
+        public ListRentInTopOrderEnum getOrderColumn() {
+            try {
+                return ListRentInTopOrderEnum.valueOf(sidx);
+            } catch (Exception e) {
+                log.warn(e.getMessage());
+                return ListRentInTopOrderEnum.totalMonthlyRent;
+            }
+        }
+    }
+
+    public ListRentInTopDto(ListRentInTopMapDTO map) {
+        if (StringUtils.hasText(map.city)) {
+            map.city = URLDecoder.decode(map.city, StandardCharsets.UTF_8);
+        }
+        if (StringUtils.hasText(map.county)) {
+            map.county = URLDecoder.decode(map.county, StandardCharsets.UTF_8);
+        }
+        this.map = map;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.example.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.util.StringUtils;
+
+import javax.validation.Valid;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+
+@NoArgsConstructor
+@Data
+public class RentInContractStatDto {
+    @Valid
+    private RentInContractStatMapDTO map;
+
+    @NoArgsConstructor
+    @Data
+    public static class RentInContractStatMapDTO {
+        @Schema(description = "账期", example = "202312")
+        private Integer statisticalMonth;
+        @Schema(description = "二级组织机构id")
+        private String city;
+        @Schema(description = "三级级组织机构id")
+        private String county;
+    }
+
+    public RentInContractStatDto(RentInContractStatMapDTO map) {
+        if (StringUtils.hasText(map.city)) {
+            map.city = URLDecoder.decode(map.city, StandardCharsets.UTF_8);
+        }
+        if (StringUtils.hasText(map.county)) {
+            map.county = URLDecoder.decode(map.county, StandardCharsets.UTF_8);
+        }
+        this.map = map;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.example.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.util.StringUtils;
+
+import javax.validation.Valid;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+
+@NoArgsConstructor
+@Data
+public class RentInUseStatDto {
+    @Valid
+    private RentInUseStatDto.RentInUseStatMapDTO map;
+
+    @NoArgsConstructor
+    @Data
+    public static class RentInUseStatMapDTO {
+        @Schema(description = "账期", example = "202312")
+        private Integer statisticalMonth;
+        @Schema(description = "二级组织机构id")
+        private String city;
+        @Schema(description = "三级级组织机构id")
+        private String county;
+    }
+
+    public RentInUseStatDto(RentInUseStatMapDTO map) {
+        if (StringUtils.hasText(map.city)) {
+            map.city = URLDecoder.decode(map.city, StandardCharsets.UTF_8);
+        }
+        if (StringUtils.hasText(map.county)) {
+            map.county = URLDecoder.decode(map.county, StandardCharsets.UTF_8);
+        }
+        this.map = map;
+    }
+}

src/main/java/com/example/entity/FileInfo.java → src/main/java/com/example/pojo/gdc/FileInfo.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package com.example.pojo.gdc;
 
 import java.util.Date;
 

src/main/java/com/example/entity/OtnAreaEntity.java → src/main/java/com/example/pojo/gdc/OtnAreaEntity.java

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

src/main/java/com/example/entity/WzBuildManageDetailsEntity.java → src/main/java/com/example/pojo/gdc/WzBuildManageDetailsEntity.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package com.example.pojo.gdc;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/example/entity/WzBuildmanageAvageareaEntity.java → src/main/java/com/example/pojo/gdc/WzBuildmanageAvageareaEntity.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package com.example.pojo.gdc;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/example/entity/WzDataInspectionEntity.java → src/main/java/com/example/pojo/gdc/WzDataInspectionEntity.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package com.example.pojo.gdc;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/example/entity/WzHouseArrearsManageEntity.java → src/main/java/com/example/pojo/gdc/WzHouseArrearsManageEntity.java

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

src/main/java/com/example/entity/WzHouseContracEntity.java → src/main/java/com/example/pojo/gdc/WzHouseContracEntity.java

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

src/main/java/com/example/entity/WzHouseContractCompareEntity.java → src/main/java/com/example/pojo/gdc/WzHouseContractCompareEntity.java

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

src/main/java/com/example/entity/WzHouseContractInEntity.java → src/main/java/com/example/pojo/gdc/WzHouseContractInEntity.java

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

src/main/java/com/example/entity/WzHouseContractOutEntity.java → src/main/java/com/example/pojo/gdc/WzHouseContractOutEntity.java

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

src/main/java/com/example/entity/WzHouseContractTopEntity.java → src/main/java/com/example/pojo/gdc/WzHouseContractTopEntity.java

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

src/main/java/com/example/entity/WzHouseCustomerEntity.java → src/main/java/com/example/pojo/gdc/WzHouseCustomerEntity.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package com.example.pojo.gdc;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/example/entity/WzHouseInCustomerEntity.java → src/main/java/com/example/pojo/gdc/WzHouseInCustomerEntity.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package com.example.pojo.gdc;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/example/entity/WzHouseLeaseInConEntity.java → src/main/java/com/example/pojo/gdc/WzHouseLeaseInConEntity.java

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