收储数据调整2

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/StorageController.java

@@ -1,6 +1,8 @@
 package com.siwei.apply.controller.cadastre;
 
 import com.siwei.apply.domain.res.*;
+import com.siwei.apply.domain.vo.LandSupplyProjectVO;
+import com.siwei.apply.service.cadastre.ISupplyService;
 import com.siwei.apply.service.cadastre.IZymlService;
 import com.siwei.apply.service.cadastre.impl.StorageServiceImpl;
 import com.siwei.common.core.domain.R;
@@ -22,11 +24,11 @@ import java.util.Map;
 public class StorageController extends BaseController {
 
     @Autowired
-    private IZymlService zymlService;
+    private StorageServiceImpl storageServiceImpl;
 
 
     @Autowired
-    private StorageServiceImpl storageServiceImpl;
+    private ISupplyService supplyService;
 
 
     /**
@@ -94,7 +96,7 @@ public class StorageController extends BaseController {
                 projectSupplyList.addAll(List.of(projectSupply1, projectSupply2, projectSupply3, projectSupply4, projectSupply5));
                 res.setProjectSupplyList(projectSupplyList);
 
-            } else if (year.equalsIgnoreCase("2025") || year.equalsIgnoreCase("2026")) {
+            } else if (year.equalsIgnoreCase("2025") ) {
                 StorageRateRes storageRate = new StorageRateRes();
                 List<LandUseRes> landUseStatisticsList = new java.util.ArrayList<>(List.of()); // 用途分析
                 List<ProjectSupplyRes> projectSupplyList = new java.util.ArrayList<>(List.of()); // 供应方式
@@ -148,9 +150,30 @@ public class StorageController extends BaseController {
                 projectSupply5.setGdType("其它");
                 projectSupply5.setGdUnit("亩");
 
+                projectSupplyList.addAll(List.of(projectSupply1, projectSupply2, projectSupply3, projectSupply4, projectSupply5));
+                res.setProjectSupplyList(projectSupplyList);
+            }else if (year.equalsIgnoreCase("2026")) {
+                StorageRateRes storageRate = new StorageRateRes();
+                List<LandUseRes> landUseStatisticsList = new java.util.ArrayList<>(List.of()); // 用途分析
+                List<ProjectSupplyRes> projectSupplyList = new java.util.ArrayList<>(List.of()); // 供应方式
+                res.setStorageRate(storageRate);
+                res.setLandUseStatisticsList(landUseStatisticsList);
+                // --------------供应方式----------------------
+                ProjectSupplyRes projectSupply1 = new ProjectSupplyRes();
+                ProjectSupplyRes projectSupply2 = new ProjectSupplyRes();
+
+                ProjectSupplyRes projectSupply3 = new ProjectSupplyRes();
+
+                ProjectSupplyRes projectSupply4 = new ProjectSupplyRes();
+
+                ProjectSupplyRes projectSupply5 = new ProjectSupplyRes();
+
                 projectSupplyList.addAll(List.of(projectSupply1, projectSupply2, projectSupply3, projectSupply4, projectSupply5));
                 res.setProjectSupplyList(projectSupplyList);
             }
+
+
+
             return R.ok(res);
         } catch (Exception e) {
             e.printStackTrace();
@@ -225,12 +248,14 @@ public class StorageController extends BaseController {
         try {
             List<TrendStatisticsData> areaTrendStatisticsList = storageServiceImpl.getData1();
             for(TrendStatisticsData obj : areaTrendStatisticsList) {
-                if(obj.getYear().equals("2023")) {
-                    obj.setOutDataArea(String.valueOf(55.5f));
+                if(obj.getYear().equals("2022")) {
+                    obj.setOutDataArea(String.valueOf(384+9.5f));
+                }else if(obj.getYear().equals("2023")) {
+                    obj.setOutDataArea(String.valueOf(110+5.5f));
                 } else if (obj.getYear().equals("2024")) {
-                    obj.setOutDataArea(String.valueOf(444.5f));
+                    obj.setOutDataArea(String.valueOf(25+44.5f));
                 } else if (obj.getYear().equals("2025")) {
-                    obj.setOutDataArea(String.valueOf(0.f));
+                    obj.setOutDataArea(String.valueOf(16.f));
                 }
             }
             return R.ok(areaTrendStatisticsList);
@@ -240,6 +265,22 @@ public class StorageController extends BaseController {
     }
 
 
+//  实际
+//            2025  16
+//            2024 25
+//            2023 110
+//            2022 384
+//
+//          存量
+//            2022  9
+//            2023  5
+//            2024  44
+//            2025 0
+
+
+
+
+
     /**
      * 根据年份，统计每一年的用途的面积
      * year 为0或者为空字符串，表示查询所有年份的数据
@@ -263,4 +304,27 @@ public class StorageController extends BaseController {
 
 
 
+    /**
+     * 根据年份和供地类型查询土地供应统计报表数据
+     * @param year
+     * @param supplyType (1-计划，2-完成)
+     * @return
+     */
+    @GetMapping("/projectList")
+    public R<List<LandSupplyProjectVO>> getProjectList(@RequestParam(required = false) String year, @RequestParam Integer supplyType) {
+        try {
+            List<LandSupplyProjectVO> resList =  supplyService.projectList(year,supplyType);
+            return R.ok(resList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
+
+
+
+
+
+
+
 }