|
@@ -180,9 +180,10 @@ public class KuaiShouAccountReportServiceImpl implements IKuaiShouAccountReportS
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
after.forEach((k, v) -> {
|
|
|
//去除没法计算的字段
|
|
|
- if (k.equals("accountId") || k.equals("authName") || v.toString().contains("%")) {
|
|
|
+ if (k.equals("accountId") || k.equals("authName") || v.toString().contains("%")||before.getString(k).contains("%")) {
|
|
|
jsonObject.put(k, "-");
|
|
|
- } else {
|
|
|
+ }else {
|
|
|
+ System.out.println(k+"--"+after.getBigDecimal(k)+"--"+before.getBigDecimal(k));
|
|
|
jsonObject.put(k, LinkUtils.countLink(after.getBigDecimal(k)==null?zero:after.getBigDecimal(k), before.getBigDecimal(k)==null?zero:before.getBigDecimal(k)));
|
|
|
}
|
|
|
});
|