调整测试数据

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

@@ -46,8 +46,6 @@ public class StorageController extends BaseController {
                 storageRate.setEstimatedCost(1254.6f);
                 storageRate.setExpenditureCost(1000.3f);
                 res.setStorageRate(storageRate);
-
-
                 // --------------土地用途分析----------------------
 
                 LandUseRes landUse1 = new LandUseRes();
@@ -66,20 +64,30 @@ public class StorageController extends BaseController {
 
                 ProjectSupplyRes projectSupply1 = new ProjectSupplyRes();
                 projectSupply1.setGdArea(263.12f);
-                projectSupply1.setGdType("出让");
+                projectSupply1.setGdType("征用");
                 projectSupply1.setGdUnit("亩");
 
                 ProjectSupplyRes projectSupply2 = new ProjectSupplyRes();
                 projectSupply2.setGdArea(220.12f);
-                projectSupply2.setGdType("划拨");
+                projectSupply2.setGdType("收回");
                 projectSupply2.setGdUnit("亩");
 
                 ProjectSupplyRes projectSupply3 = new ProjectSupplyRes();
                 projectSupply3.setGdArea(190.12f);
-                projectSupply3.setGdType("其它");
+                projectSupply3.setGdType("收购");
                 projectSupply3.setGdUnit("亩");
 
-                projectSupplyList.addAll(List.of(projectSupply1, projectSupply2, projectSupply3));
+                ProjectSupplyRes projectSupply4 = new ProjectSupplyRes();
+                projectSupply4.setGdArea(390.12f);
+                projectSupply4.setGdType("置换");
+                projectSupply4.setGdUnit("亩");
+
+                ProjectSupplyRes projectSupply5 = new ProjectSupplyRes();
+                projectSupply5.setGdArea(250.12f);
+                projectSupply5.setGdType("其它");
+                projectSupply5.setGdUnit("亩");
+
+                projectSupplyList.addAll(List.of(projectSupply1, projectSupply2, projectSupply3, projectSupply4, projectSupply5));
                 res.setProjectSupplyList(projectSupplyList);
 
             } else if (year.equalsIgnoreCase("2025") || year.equalsIgnoreCase("2026")) {
@@ -110,27 +118,34 @@ public class StorageController extends BaseController {
                 res.setLandUseStatisticsList(landUseStatisticsList);
 
                 // --------------供应方式----------------------
-
                 ProjectSupplyRes projectSupply1 = new ProjectSupplyRes();
                 projectSupply1.setGdArea(263.12f + (float) (Math.random() * 100));
-                projectSupply1.setGdType("出让");
+                projectSupply1.setGdType("征用");
                 projectSupply1.setGdUnit("亩");
 
                 ProjectSupplyRes projectSupply2 = new ProjectSupplyRes();
                 projectSupply2.setGdArea(220.12f + (float) (Math.random() * 100));
-                projectSupply2.setGdType("划拨");
+                projectSupply2.setGdType("收回");
                 projectSupply2.setGdUnit("亩");
 
                 ProjectSupplyRes projectSupply3 = new ProjectSupplyRes();
                 projectSupply3.setGdArea(190.12f + (float) (Math.random() * 100));
-                projectSupply3.setGdType("其它");
+                projectSupply3.setGdType("收购");
                 projectSupply3.setGdUnit("亩");
 
-                projectSupplyList.addAll(List.of(projectSupply1, projectSupply2, projectSupply3));
-                res.setProjectSupplyList(projectSupplyList);
+                ProjectSupplyRes projectSupply4 = new ProjectSupplyRes();
+                projectSupply4.setGdArea(390.12f);
+                projectSupply4.setGdType("置换");
+                projectSupply4.setGdUnit("亩");
 
-            }
+                ProjectSupplyRes projectSupply5 = new ProjectSupplyRes();
+                projectSupply5.setGdArea(250.12f);
+                projectSupply5.setGdType("其它");
+                projectSupply5.setGdUnit("亩");
 
+                projectSupplyList.addAll(List.of(projectSupply1, projectSupply2, projectSupply3, projectSupply4, projectSupply5));
+                res.setProjectSupplyList(projectSupplyList);
+            }
             return R.ok(res);
         } catch (Exception e) {
             e.printStackTrace();
@@ -184,7 +199,7 @@ public class StorageController extends BaseController {
             modeMap3.put("transferArea", 487.7); // 出让
             modeMap3.put("allocateArea", 400.5); // 划拨区域
             modeMap3.put("otherArea", 398.23); // 其它区域面积
-            supplyModeStatisticsList.add(modeMap2);
+            supplyModeStatisticsList.add(modeMap3);
             res.setSupplyModeStatisticsList(supplyModeStatisticsList);
             return R.ok(res);
         } catch (Exception e) {