修改查询返回值

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/PackageCodeTypeRes.java

@@ -21,7 +21,7 @@ public class PackageCodeTypeRes {
     private Long createCapNumber;
 
     @ApiModelProperty("生成码数量同比")
-    private String createPercent;
+    private Double createPercent;
 
     @ApiModelProperty(value = "下载箱码数量")
     private Long loadBoxNumber;
@@ -30,7 +30,7 @@ public class PackageCodeTypeRes {
     private Long loadCapNumber;
 
     @ApiModelProperty("下载码数量同比")
-    private String loadPercent;
+    private Double loadPercent;
 
     @ApiModelProperty(value = "激活箱码数量")
     private Long activateBoxNumber;
@@ -39,6 +39,6 @@ public class PackageCodeTypeRes {
     private Long activateCapNumber;
 
     @ApiModelProperty("激活码数量同比")
-    private String activatePercent;
+    private Double activatePercent;
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ReportServiceImpl.java

@@ -242,11 +242,10 @@ public class ReportServiceImpl implements ReportService {
             ListPackageCodeVo downloadPresentBean = reportServiceMapper.queryPackageCodeNum(map.get("beginDate"), map.get("endDate"), 2);
             //查询往期激活码（参数：开始时间，结束时间，1-同期/2-往期）
             ListPackageCodeVo activatePresentBean = reportServiceMapper.queryActivateCodeNum(map.get("beginDate"), map.get("endDate"));
-
             //计算增长率
             res.setCreatePercent(percentBigDecimal(res.getCreateBoxNumber()+res.getCreateCapNumber(), createPresentBean.getQrBoxNumber()+createPresentBean.getQrCapNumber()));
-            res.setCreatePercent(percentBigDecimal(res.getLoadBoxNumber()+res.getLoadCapNumber(), downloadPresentBean.getQrBoxNumber()+downloadPresentBean.getQrCapNumber()));
-            res.setCreatePercent(percentBigDecimal(res.getActivateBoxNumber()+res.getActivateCapNumber(), activatePresentBean.getQrBoxNumber()+activatePresentBean.getQrCapNumber()));
+            res.setLoadPercent(percentBigDecimal(res.getLoadBoxNumber()+res.getLoadCapNumber(), downloadPresentBean.getQrBoxNumber()+downloadPresentBean.getQrCapNumber()));
+            res.setActivatePercent(percentBigDecimal(res.getActivateBoxNumber()+res.getActivateCapNumber(), activatePresentBean.getQrBoxNumber()+activatePresentBean.getQrCapNumber()));
         }
 
         //返回参数
@@ -271,20 +270,20 @@ public class ReportServiceImpl implements ReportService {
      * @param before 往期数
      * @return
      */
-    public static String percentBigDecimal(long present, long before) {
+    public static double percentBigDecimal(long present, long before) {
         BigDecimal preNum = BigDecimal.valueOf(present);
         BigDecimal sufNum = BigDecimal.valueOf(before);
         double result = countDecimal(preNum, sufNum);
         if (result > 0) {
-            return "+" + result + "%";
+            return  result;
         }
         if (result < 0) {
-            return "-" + Math.abs(result) + "%";
+            return -Math.abs(result);
         }
         if (result == 0) {
-            return "0%";
+            return 0;
         }
-        return null;
+        return 0;
     }
 
     public static double countDecimal(BigDecimal preNum, BigDecimal sufNum) {