|
@@ -4,7 +4,6 @@ import cn.com.ctop.common.module.utils.Check;
|
|
|
import cn.com.ctop.common.module.utils.CtopAdConstant;
|
|
|
import cn.com.ctop.common.module.utils.ExportExcelUtils;
|
|
|
import cn.com.ctop.common.module.utils.HttpUtils;
|
|
|
-import cn.com.ctop.kuaishou.modules.utils.LinkUtils;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
@@ -27,6 +26,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
import java.io.OutputStream;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
import java.text.ParseException;
|
|
|
import java.util.*;
|
|
|
|
|
@@ -91,7 +91,7 @@ public class MaterialReportOverViewServiceImpl implements IMaterialReportOverVie
|
|
|
BigDecimal cost = materialReportOverViewMapper.queryBytedanceCost(startDate, endDate, projects);
|
|
|
BigDecimal lastCost = materialReportOverViewMapper.queryBytedanceCost(DateUtils.addDay(startDate, -DateUtils.dateDiff(startDate, endDate)-1), DateUtils.addDay(startDate, -1), projects);
|
|
|
result.put("cost", cost);
|
|
|
- result.put("costLink", LinkUtils.countLink(cost == null ? BigDecimal.ZERO : cost, lastCost == null ? BigDecimal.ZERO : lastCost));
|
|
|
+ result.put("costLink", countLink(cost == null ? BigDecimal.ZERO : cost, lastCost == null ? BigDecimal.ZERO : lastCost));
|
|
|
result.put("video", materialReportOverViewMapper.queryMaterialCount(startDate, endDate, projects));
|
|
|
result.put("newVideo", materialReportOverViewMapper.queryNewMaterialCount(DateUtils.date2Str(), projects));
|
|
|
result.put("hot", 0);
|
|
@@ -100,7 +100,7 @@ public class MaterialReportOverViewServiceImpl implements IMaterialReportOverVie
|
|
|
BigDecimal cost = materialReportOverViewMapper.queryKuaishouCost(startDate, endDate, projects);
|
|
|
BigDecimal lastCost = materialReportOverViewMapper.queryKuaishouCost(DateUtils.addDay(startDate, -DateUtils.dateDiff(startDate, endDate)-1), DateUtils.addDay(startDate, -1), projects);
|
|
|
result.put("cost", cost);
|
|
|
- result.put("costLink", LinkUtils.countLink(cost == null ? BigDecimal.ZERO : cost, lastCost == null ? BigDecimal.ZERO : lastCost));
|
|
|
+ result.put("costLink", countLink(cost == null ? BigDecimal.ZERO : cost, lastCost == null ? BigDecimal.ZERO : lastCost));
|
|
|
result.put("video", materialReportOverViewMapper.queryMaterialCount(startDate, endDate, projects));
|
|
|
result.put("newVideo", materialReportOverViewMapper.queryNewMaterialCount(DateUtils.date2Str(), projects));
|
|
|
result.put("hot", 0);
|
|
@@ -383,4 +383,14 @@ public class MaterialReportOverViewServiceImpl implements IMaterialReportOverVie
|
|
|
}
|
|
|
return titles;
|
|
|
}
|
|
|
+
|
|
|
+ //环比计算
|
|
|
+ public BigDecimal countLink(BigDecimal numA, BigDecimal numB) {
|
|
|
+ BigDecimal link = new BigDecimal(0);
|
|
|
+ if (numB.compareTo(BigDecimal.ZERO)!=0) {
|
|
|
+ link = (numA.subtract(numB)).divide(numB, 4, RoundingMode.HALF_UP);
|
|
|
+ }
|
|
|
+ return link;
|
|
|
+ }
|
|
|
+
|
|
|
}
|