ljx：修改招商接口返回的数据值和类型

enteprise-admin/src/main/java/com/enteprise/attract_inv/domain/dto/AttractInvDto.java

@@ -1,5 +1,9 @@
 package com.enteprise.attract_inv.domain.dto;
 
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.util.List;
+
 public class AttractInvDto {
     /**
      * 企业id
@@ -9,67 +13,123 @@ public class AttractInvDto {
     private String typeNum;
 
     private String enterpriseName;
-    /**
-     * 企业近三年用地
-     */
-    private double landUsedInRecentThreeYears;
-    /**
-     * 企业近三年总值
-     */
-    private double averageAnnualOutputValue;
-    /**
-     * 近三年实缴税金
-     */
-    private double averageAnnualTaxPaid;
 
 
-    public String getEnterpriseName() {
-        return enterpriseName;
+    private double quNianTax;
+
+    private double quNianArea;
+
+    private double quNianInd;
+
+    private double qianNianTax;
+
+    private double qianNianArea;
+
+    private double qianNianInd;
+
+
+    private double daQianNianTax;
+
+    private double daQianNianArea;
+
+    private double daQianNianInd;
+
+
+    public Double getQuNianTax() {
+        return quNianTax;
     }
 
-    public void setEnterpriseName(String enterpriseName) {
-        this.enterpriseName = enterpriseName;
+    public void setQuNianTax(Double quNianTax) {
+        this.quNianTax = quNianTax;
     }
 
-    public String getTypeNum() {
-        return typeNum;
+    public Double getQuNianArea() {
+        return quNianArea;
     }
 
-    public void setTypeNum(String typeNum) {
-        this.typeNum = typeNum;
+    public void setQuNianArea(Double quNianArea) {
+        this.quNianArea = quNianArea;
     }
 
-    public Long getId() {
-        return id;
+    public Double getQuNianInd() {
+        return quNianInd;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setQuNianInd(Double quNianInd) {
+        this.quNianInd = quNianInd;
+    }
+
+    public Double getQianNianTax() {
+        return qianNianTax;
     }
 
-    public double getLandUsedInRecentThreeYears() {
-        return landUsedInRecentThreeYears;
+    public void setQianNianTax(Double qianNianTax) {
+        this.qianNianTax = qianNianTax;
     }
 
-    public void setLandUsedInRecentThreeYears(double landUsedInRecentThreeYears) {
-        this.landUsedInRecentThreeYears = landUsedInRecentThreeYears;
+    public Double getQianNianArea() {
+        return qianNianArea;
     }
 
-    public double getAverageAnnualOutputValue() {
-        return averageAnnualOutputValue;
+    public void setQianNianArea(Double qianNianArea) {
+        this.qianNianArea = qianNianArea;
     }
 
-    public void setAverageAnnualOutputValue(double averageAnnualOutputValue) {
-        this.averageAnnualOutputValue = averageAnnualOutputValue;
+    public Double getQianNianInd() {
+        return qianNianInd;
     }
 
+    public void setQianNianInd(Double qianNianInd) {
+        this.qianNianInd = qianNianInd;
+    }
 
-    public double getAverageAnnualTaxPaid() {
-        return averageAnnualTaxPaid;
+    public Double getDaQianNianTax() {
+        return daQianNianTax;
     }
 
-    public void setAverageAnnualTaxPaid(double averageAnnualTaxPaid) {
-        this.averageAnnualTaxPaid = averageAnnualTaxPaid;
+    public void setDaQianNianTax(Double daQianNianTax) {
+        this.daQianNianTax = daQianNianTax;
     }
 
+    public Double getDaQianNianArea() {
+        return daQianNianArea;
+    }
+
+    public void setDaQianNianArea(Double daQianNianArea) {
+        this.daQianNianArea = daQianNianArea;
+    }
+
+    public Double getDaQianNianInd() {
+        return daQianNianInd;
+    }
+
+    public void setDaQianNianInd(Double daQianNianInd) {
+        this.daQianNianInd = daQianNianInd;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getTypeNum() {
+        return typeNum;
+    }
+
+    public void setTypeNum(String typeNum) {
+        this.typeNum = typeNum;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+
 }

enteprise-admin/src/main/java/com/enteprise/attract_inv/service/impl/AttractInvServiceImpl.java

@@ -80,46 +80,32 @@ public class AttractInvServiceImpl implements IAttractInvService {
             attractInvDto.setTypeNum(dto.getTypeNum());
             attractInvDto.setEnterpriseName(enterpriseName);
             //近三年企业数据
-            double areaSum = 0;
-            double taxSum = 0;
-            double industrialSum = 0;
-            int divisorA = 0;
-            int divisorB = 0;
-            int divisorC = 0;
             for (int i = 1; i<4; i++) {
                 EnterpriseBaseDataYear dataYear = new EnterpriseBaseDataYear();
                 dataYear.setYear(String.valueOf(year - i));
                 dataYear.setEnterpriseName(enterpriseName);
                 List<EnterpriseBaseDataYear> yearList = enterpriseBaseDataYearMapper.selectEnterpriseBaseDataYearList(dataYear);
                 if (!yearList.isEmpty()) {
-                    Double landArea = yearList.get(0).getLandArea();
-                    areaSum += landArea;
+                    double landArea = yearList.get(0).getLandArea();
                     double tax = yearList.get(0).getPaidTax();
-                    taxSum += tax;
                     double industrialValue = yearList.get(0).getTotalIndustrialValue();
-                    industrialSum += industrialValue;
-                    if (tax != 0) {
-                        divisorA += 1;
+                    if (i == 1){
+                        attractInvDto.setQuNianArea(landArea);
+                        attractInvDto.setQuNianInd(industrialValue);
+                        attractInvDto.setQuNianTax(tax);
                     }
-                    if (industrialValue != 0) {
-                        divisorB += 1;
+                    if (i == 2){
+                        attractInvDto.setQianNianArea(landArea);
+                        attractInvDto.setQianNianInd(industrialValue);
+                        attractInvDto.setQianNianTax(tax);
                     }
-                    if (landArea != 0) {
-                        divisorC += 1;
+                    if (i == 3){
+                        attractInvDto.setDaQianNianArea(landArea);
+                        attractInvDto.setDaQianNianInd(industrialValue);
+                        attractInvDto.setDaQianNianTax(tax);
                     }
                 }
             }
-            //计算该企业近三年的用地、年均产值、年均实缴税金
-            if (divisorB !=0) {
-                attractInvDto.setAverageAnnualOutputValue(industrialSum / divisorB);
-            }
-            if (divisorA != 0) {
-                attractInvDto.setAverageAnnualTaxPaid(taxSum / divisorA);
-            }
-            if (divisorC != 0) {
-                attractInvDto.setLandUsedInRecentThreeYears(areaSum / divisorC);
-            }
-            //添加到返回list
             attractInvDtos.add(attractInvDto);
         }
         attractInvReturnDto.setList(attractInvDtos);