Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicRegionalCompareDto.java

 package com.dsk.common.dtos;
 
-import lombok.Data;
+import cn.hutool.core.util.ObjectUtil;
 
 import java.util.List;
 
@@ -11,7 +11,6 @@ import java.util.List;
  * @Date 2023/5/23 14:05
  * @Version
  */
-@Data
 public class OpRegionalEconomicRegionalCompareDto {
 
     /**
@@ -20,4 +19,34 @@ public class OpRegionalEconomicRegionalCompareDto {
     private Integer year;
 
     private List<OpRegionalEconomicDataStatisticsRegionalDto> compareList;
+
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public List<OpRegionalEconomicDataStatisticsRegionalDto> getCompareList() {
+        if (ObjectUtil.isNotEmpty(compareList)) {
+            for (OpRegionalEconomicDataStatisticsRegionalDto dataStatisticsRegionalDto : compareList) {
+                dataStatisticsRegionalDto.setYear(year);
+            }
+        }
+        return compareList;
+    }
+
+    public void setCompareList(List<OpRegionalEconomicDataStatisticsRegionalDto> compareList) {
+        this.compareList = compareList;
+    }
+
+    @Override
+    public String toString() {
+        return "OpRegionalEconomicRegionalCompareDto{" +
+                "year=" + year +
+                ", compareList=" + compareList +
+                '}';
+    }
 }