ljx：修改：1.同比增速返回值去掉NaN和Infinity；2.招商辅助返回值为list

enteprise-admin/src/main/java/com/enteprise/attract_inv/controller/AttractInvController.java

@@ -26,6 +26,8 @@ public class AttractInvController extends BaseController {
     public TableDataInfo analysis(@RequestBody AttractInv attractInv)
     {
         AttractInvReturnDto data = attractInvService.getData(attractInv);
-        return getDataTable(Collections.singletonList(new ArrayList<>().add(data)));
+        ArrayList<AttractInvReturnDto> list = new ArrayList<>();
+        list.add(data);
+        return getDataTable(list);
     }
 }

enteprise-admin/src/main/java/com/enteprise/growthRate/service/impl/GrowthRateServiceImpl.java

@@ -72,10 +72,10 @@ public class GrowthRateServiceImpl implements IGrowthRateService {
                             oldSum += oldDataMonths.get(0).getPowerConsume();
                         }
                     }
-                    //计算同比增速:（今年-去年）/去年
-                    double rate = (sum - oldSum) / oldSum;
-                    //初始化企业并把该企业的同比增速和其他数据放入list中
-                    if (rate != 0 ) {
+                    if (oldSum != 0 ) {
+                        //计算同比增速:（今年-去年）/去年
+                        double rate = (sum - oldSum) / oldSum;
+                        //初始化企业并把该企业的同比增速和其他数据放入list中
                         GrowthRateDto growthRateDto = new GrowthRateDto();
                         growthRateDto.setRate(rate);
                         growthRateDto.setEnterpriseName(enterpriseDto.getEnterpriseName());
@@ -105,10 +105,10 @@ public class GrowthRateServiceImpl implements IGrowthRateService {
                         sum = dataSeasons.get(0).getPaidTax();
                         oldSum = oldDataSeasons.get(0).getPaidTax();
                     }
-                    //计算同比增速:（今年-去年）/去年
-                    double rate = (double) (sum - oldSum) / oldSum;
-                    //初始化企业并把该企业的同比增速和其他数据放入list中
-                    if (rate != 0) {
+                    if (oldSum != 0) {
+                        //计算同比增速:（今年-去年）/去年
+                        double rate = (double) (sum - oldSum) / oldSum;
+                        //初始化企业并把该企业的同比增速和其他数据放入list中
                         GrowthRateDto growthRateDto = new GrowthRateDto();
                         growthRateDto.setRate(rate);
                         growthRateDto.setEnterpriseName(dto.getEnterpriseName());
@@ -136,9 +136,9 @@ public class GrowthRateServiceImpl implements IGrowthRateService {
                     sum = dataYears.get(0).getFunding();
                     oldSum = oldDataYears.get(0).getFunding();
                 }
-                //计算同比增速:（今年-去年）/去年
-                double rate = (double) (sum - oldSum) / oldSum;
-                if (rate != 0 ) {
+                if (oldSum != 0 ) {
+                    //计算同比增速:（今年-去年）/去年
+                    double rate = (double) (sum - oldSum) / oldSum;
                     //初始化企业并把该企业的同比增速和其他数据放入list中
                     GrowthRateDto growthRateDto = new GrowthRateDto();
                     growthRateDto.setRate(rate);