diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index f0be90be..ec4faa15 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -41,6 +41,7 @@ import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -397,6 +398,17 @@ public class ProjectDailyService extends ServiceImpl projectDailyVos=baseMapper.getProjectDailys(qw); ProjectDailyVosBig projectDailyV=baseMapper.getProjectDailySum(qw); + QueryWrapper qw2 = new QueryWrapper<>(); + if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) { + qw2.eq("orderDate",sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getOrderDate()),-1)) ); + }else{ + qw2.eq("orderDate",sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-1))); + } + + if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { + qw2.eq("projectSid", params.getProjectSid()); + } + ProjectDailyVosBig projectDailyYest=baseMapper.getProjectDailySum(qw2); List sids=new ArrayList<>(); for(ProjectDailyVos projectDailyVos1:projectDailyVos){ @@ -423,6 +435,11 @@ public class ProjectDailyService extends ServiceImpl> getProjectDailyZx(ProjectDailyQuery query) { diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java index 86524da2..e11e4da7 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java @@ -67,6 +67,11 @@ public class ProjectDailyVosBig { private BigDecimal dcUseLimit=new BigDecimal(0); private int yingShou; private BigDecimal ysUseLimit=new BigDecimal(0); + private BigDecimal accountsBalanceBfb; + private BigDecimal accountsReceivableBfb; + private BigDecimal stockAmountBfb; + private BigDecimal transitAmountBfb; + private BigDecimal advancePaymentBfb; /**