添加条件过滤

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/tdgy/TdgsController.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/tdgy/TdtjController.java

@@ -1,23 +1,19 @@
 package com.onemap.apply.controller.tdgy;
 
-import com.onemap.apply.domain.tdgy.vo.UpdateTdgyVo;
-import com.onemap.apply.service.tdgy.TdgyService;
 import com.onemap.apply.service.tdgy.TdtjService;
 import com.onemap.common.core.web.domain.RequestResult;
 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.annotation.Resource;
-import javax.validation.Valid;
 
 /**
  * 闲置土地统计
  */
 @RestController
 @RequestMapping("/tdtj")
-public class TdgsController {
+public class TdtjController {
     @Resource
     private TdtjService tdtjService;
 
@@ -27,20 +23,20 @@ public class TdgsController {
      * @return
      */
     @GetMapping("/overview")
-    public RequestResult overviewTdtj() {
-        RequestResult requestResult = tdtjService.getOverview();
+    public RequestResult overviewTdtj(String startTime, String endTime) {
+        RequestResult requestResult = tdtjService.getOverview(startTime, endTime);
         return requestResult;
     }
 
     @GetMapping("/district")
-    public RequestResult districtTdtj() {
-        RequestResult requestResult = tdtjService.getDistrict();
+    public RequestResult districtTdtj(String startTime, String endTime) {
+        RequestResult requestResult = tdtjService.getDistrict(startTime, endTime);
         return requestResult;
     }
 
     @GetMapping("/reason")
-    public RequestResult reasonTdtj() {
-        RequestResult requestResult = tdtjService.getReason();
+    public RequestResult reasonTdtj(String startTime, String endTime) {
+        RequestResult requestResult = tdtjService.getReason(startTime, endTime);
         return requestResult;
     }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/tdgy/TdgyMapper.java

@@ -3,7 +3,6 @@ package com.onemap.apply.mapper.tdgy;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.onemap.apply.domain.tdgy.dto.TdgySjDTO;
 import com.onemap.common.datasource.annotation.Slave;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/tdgy/TdtjServiceImp.java

@@ -20,7 +20,7 @@ public class TdtjServiceImp implements TdtjService {
     // TODO:只统计22年~24年的数据
 
     @Override
-    public RequestResult getOverview() {
+    public RequestResult getOverview(String startTime, String endTime) {
         Map<String, Object> map = new HashMap<>();
 
         // 获取疑似土地总数
@@ -61,7 +61,7 @@ public class TdtjServiceImp implements TdtjService {
     }
 
     @Override
-    public RequestResult getDistrict() {
+    public RequestResult getDistrict(String startTime, String endTime) {
         List<Map<String, Object>> listRes = new ArrayList<>();
         List<Map<String, Object>> districtMaps = tdgyMapper.getAreaByDistrict();
 
@@ -91,7 +91,7 @@ public class TdtjServiceImp implements TdtjService {
     }
 
     @Override
-    public RequestResult getReason() {
+    public RequestResult getReason(String startTime, String endTime) {
         List<Map<String, Object>> reasonMaps = tdgyMapper.getAreaByReason();
         return RequestResult.success(reasonMaps);
     }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/tdgy/TdtjService.java

@@ -3,9 +3,9 @@ package com.onemap.apply.service.tdgy;
 import com.onemap.common.core.web.domain.RequestResult;
 
 public interface TdtjService {
-    RequestResult getOverview();
+    RequestResult getOverview(String startTime, String endTime);
 
-    RequestResult getDistrict();
+    RequestResult getDistrict(String startTime, String endTime);
 
-    RequestResult getReason();
+    RequestResult getReason(String startTime, String endTime);
 }