Merge remote-tracking branch 'origin/master'

enteprise-admin/src/main/java/com/enteprise/growthRate/controller/GrowthRateController.java

@@ -24,8 +24,9 @@ public class GrowthRateController extends BaseController {
     @PostMapping("/analysis")
     public TableDataInfo analysisGrowthRate(@RequestBody GrowthRate growthRate)
     {
-        startPage();
+//        startPage();
         List<GrowthRateDto> list = growthRateService.analysisGrowthRate(growthRate);
         return getDataTable(list);
+//        return list;
     }
 }

enteprise-admin/src/main/java/com/enteprise/industry_oveview/controller/IndustryOverviewController.java

@@ -25,7 +25,7 @@ import com.enteprise.common.core.page.TableDataInfo;
 
 /**
  * industry_oveviewController
- * 
+ *
  * @author ruoyi
  * @date 2024-11-11
  */
@@ -49,6 +49,14 @@ public class IndustryOverviewController extends BaseController
         return getDataTable(industryOverviews);
     }
 
+    @PreAuthorize("@ss.hasPermi('industry_oveview:industry_oveview:listYear')")
+    @GetMapping("/list/year")
+    public TableDataInfo listYear(IndustryOverview industryOverview)
+    {
+        List<IndustryOverview> industryOverviews = industryOverviewService.selectIndustryOverviewListYear(industryOverview);
+        return getDataTable(industryOverviews);
+    }
+
     /**
      * 查询行业数量列表
      */

enteprise-admin/src/main/java/com/enteprise/industry_oveview/service/IIndustryOverviewService.java

@@ -7,15 +7,15 @@ import com.enteprise.industry_oveview.domain.IndustryOverview;
 
 /**
  * industry_oveviewService接口
- * 
+ *
  * @author ruoyi
  * @date 2024-11-11
  */
-public interface IIndustryOverviewService 
+public interface IIndustryOverviewService
 {
     /**
      * 查询industry_oveview
-     * 
+     *
      * @param id industry_oveview主键
      * @return industry_oveview
      */
@@ -23,17 +23,19 @@ public interface IIndustryOverviewService
 
     /**
      * 查询industry_oveview列表
-     * 
+     *
      * @param industryOverview industry_oveview
      * @return industry_oveview集合
      */
     public List<IndustryOverview> selectIndustryOverviewList(IndustryOverview industryOverview);
 
+    public List<IndustryOverview> selectIndustryOverviewListYear(IndustryOverview industryOverview);
+
     public List<IndustryCount> selectIndustryCountList();
 
     /**
      * 新增industry_oveview
-     * 
+     *
      * @param industryOverview industry_oveview
      * @return 结果
      */
@@ -41,7 +43,7 @@ public interface IIndustryOverviewService
 
     /**
      * 修改industry_oveview
-     * 
+     *
      * @param industryOverview industry_oveview
      * @return 结果
      */
@@ -49,7 +51,7 @@ public interface IIndustryOverviewService
 
     /**
      * 批量删除industry_oveview
-     * 
+     *
      * @param ids 需要删除的industry_oveview主键集合
      * @return 结果
      */
@@ -57,7 +59,7 @@ public interface IIndustryOverviewService
 
     /**
      * 删除industry_oveview信息
-     * 
+     *
      * @param id industry_oveview主键
      * @return 结果
      */

enteprise-admin/src/main/java/com/enteprise/industry_oveview/service/impl/IndustryOverviewServiceImpl.java

@@ -16,12 +16,12 @@ import com.enteprise.industry_oveview.service.IIndustryOverviewService;
 
 /**
  * industry_oveviewService业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2024-11-11
  */
 @Service
-public class IndustryOverviewServiceImpl implements IIndustryOverviewService 
+public class IndustryOverviewServiceImpl implements IIndustryOverviewService
 {
     @Autowired
     private IndustryOverviewMapper industryOverviewMapper;
@@ -31,7 +31,7 @@ public class IndustryOverviewServiceImpl implements IIndustryOverviewService
 
     /**
      * 查询industry_oveview
-     * 
+     *
      * @param id industry_oveview主键
      * @return industry_oveview
      */
@@ -43,7 +43,7 @@ public class IndustryOverviewServiceImpl implements IIndustryOverviewService
 
     /**
      * 查询industry_oveview列表
-     * 
+     *
      * @param industryOverview industry_oveview
      * @return industry_oveview
      */
@@ -95,6 +95,21 @@ public class IndustryOverviewServiceImpl implements IIndustryOverviewService
     }
 
     @Override
+    public List<IndustryOverview> selectIndustryOverviewListYear(IndustryOverview industryOverview) {
+        List<IndustryOverview> list = new ArrayList<>();
+        List<Integer> years = new ArrayList<>();
+        List<IndustryOverview> industryOverviews = industryOverviewMapper.selectIndustryOverviewList(industryOverview);
+        IndustryOverview latestData = null;
+        for (IndustryOverview item : industryOverviews){
+            years.add(item.getYear());
+            latestData = item;
+            latestData.setYears(years);
+        }
+        list.add(latestData);
+        return list;
+    }
+
+    @Override
     public List<IndustryCount> selectIndustryCountList() {
         //获取前十排名
         List<IndustryCount> collect = industryOverviewMapper.selectIndustryCount().stream().limit(10).collect(Collectors.toList());
@@ -120,7 +135,7 @@ public class IndustryOverviewServiceImpl implements IIndustryOverviewService
 
     /**
      * 新增industry_oveview
-     * 
+     *
      * @param industryOverview industry_oveview
      * @return 结果
      */
@@ -132,7 +147,7 @@ public class IndustryOverviewServiceImpl implements IIndustryOverviewService
 
     /**
      * 修改industry_oveview
-     * 
+     *
      * @param industryOverview industry_oveview
      * @return 结果
      */
@@ -144,7 +159,7 @@ public class IndustryOverviewServiceImpl implements IIndustryOverviewService
 
     /**
      * 批量删除industry_oveview
-     * 
+     *
      * @param ids 需要删除的industry_oveview主键
      * @return 结果
      */
@@ -156,7 +171,7 @@ public class IndustryOverviewServiceImpl implements IIndustryOverviewService
 
     /**
      * 删除industry_oveview信息
-     * 
+     *
      * @param id industry_oveview主键
      * @return 结果
      */