年份进行全部调整

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

@@ -39,7 +39,7 @@ public class StorageController extends BaseController {
      * 年度统计
      */
     @GetMapping("/yearStatistics/{year}")
-    public R<StorageYearStatisticsRes> getYearStatistics(@PathVariable String year) {
+    public R<StorageYearStatisticsRes> getYearStatistics(@PathVariable(required = false) String year) {
         try {
             return R.ok(storageServiceImpl.getYearStatistics(year));
         } catch (Exception e) {

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

@@ -47,7 +47,7 @@ public class SupplyController extends BaseController {
      *
      */
     @GetMapping("/yearStatistics/{year}")
-    public R<SupplyYearStatisticsRes> getYearStatistics(@PathVariable String year) {
+    public R<SupplyYearStatisticsRes> getYearStatistics(@PathVariable(required = false) String year) {
         try {
             SupplyYearStatisticsRes res =  supplyService.yearStatistics(year);
             return R.ok(res);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/StorageServiceImpl.java

@@ -541,7 +541,9 @@ public class StorageServiceImpl {
 
     public StorageYearStatisticsRes getYearStatistics(String year) {
         StorageYearStatisticsRes res = new StorageYearStatisticsRes();
-
+        if(StringUtils.isBlank(year)||"0".equals(year)){
+            year = "";
+        }
         Map<String, Object> planSummary = gjShouchuJihuaMapper.getPlanSummaryByYear(year);
         List<TdgyStatisticsRes> completeList = gjShijiShouchuMapper.gjShijiShouchuListByYear(year, null, null, null, null, null);
         BigDecimal planArea = toBigDecimal(planSummary == null ? null : planSummary.get("plan_area"));

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/SupplyServiceImpl.java

@@ -66,6 +66,9 @@ public class SupplyServiceImpl implements ISupplyService {
      */
     @Override
     public SupplyYearStatisticsRes yearStatistics(String year) {
+        if(StringUtils.isBlank(year)||"0".equals(year)){
+            year = "";
+        }
         SupplyYearStatisticsRes res = new SupplyYearStatisticsRes();
         GongdiJihuaFilterVo filterVo = new GongdiJihuaFilterVo();
         filterVo.setYear(year);