11/24

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<ProjectDailyMapper, Project
         }
         List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw);
         ProjectDailyVosBig projectDailyV=baseMapper.getProjectDailySum(qw);
+        QueryWrapper<ProjectDaily> 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<String> sids=new ArrayList<>();
         for(ProjectDailyVos projectDailyVos1:projectDailyVos){
@@ -423,6 +435,11 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
             }
             System.out.println(info);
         }
+        projectDailyV.setAccountsBalanceBfb(projectDailyV.getAccountsBalance().subtract(projectDailyYest.getAccountsBalance()).divide(projectDailyYest.getAccountsBalance(),2, RoundingMode.HALF_UP));
+        projectDailyV.setAccountsReceivableBfb(projectDailyV.getAccountsReceivable().subtract(projectDailyYest.getAccountsReceivable()).divide(projectDailyYest.getAccountsReceivable(),2, RoundingMode.HALF_UP));
+        projectDailyV.setStockAmountBfb(projectDailyV.getStockAmount().subtract(projectDailyYest.getStockAmount()).divide(projectDailyYest.getStockAmount(),2, RoundingMode.HALF_UP));
+        projectDailyV.setTransitAmountBfb(projectDailyV.getTransitAmount().subtract(projectDailyYest.getTransitAmount()).divide(projectDailyYest.getTransitAmount(),2, RoundingMode.HALF_UP));
+        projectDailyV.setAdvancePaymentBfb(projectDailyV.getAdvancePayment().subtract(projectDailyYest.getAdvancePayment()).divide(projectDailyYest.getAdvancePayment(),2, RoundingMode.HALF_UP));
         return rb.success().setData(projectDailyV);
     }
     public ResultBean<Map<String,Object>> getProjectDailyZx(ProjectDailyQuery query) {

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;
 
 
     /**