修改统计汇总代码

src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java

@@ -96,7 +96,7 @@ public class IoStatDayServiceImpl implements IoStatDayService {
             ew.eq("month", twoDay.monthBaseOne());
             ew.eq("day", twoDay.dayOfMonth());
             List<IoStatDayEntity> ioStatDayEntityList=statDayDao.selectList(ew);
-            List<IoStatDayEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatDayEntityList);
+            List<IoStatDayEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatDayEntityList,yesterday);
             dataList.addAll(newOrOldDate);
             //插入汇总记录
             saveData(yesterday, dataList);
@@ -229,7 +229,7 @@ public class IoStatDayServiceImpl implements IoStatDayService {
 
     private static QueryWrapper<IoStatDayEntity> buildQueryWrapper(IoOrderDetailResultEntity orderDetailResultEntity, DateTime yesterday) {
         QueryWrapper<IoStatDayEntity> wrapper = new QueryWrapper<>();
-        DateTime dateTime = DateUtil.offsetDay(yesterday, -1); //取前天的时间
+        DateTime dateTime =DateUtil.offsetDay(yesterday, -1); //取前天的时间
         wrapper.eq("year", dateTime.year())
                 .eq("month", dateTime.monthBaseOne())
                 .eq("day", dateTime.dayOfMonth()) //取前天的数据
@@ -239,7 +239,7 @@ public class IoStatDayServiceImpl implements IoStatDayService {
         return wrapper;
     }
 
-    private List<IoStatDayEntity> getNewOrOldDate(List<IoStatDayEntity> newIoStatDayEntity, List<IoStatDayEntity> oldIoStatDayEntity){
+    private List<IoStatDayEntity> getNewOrOldDate(List<IoStatDayEntity> newIoStatDayEntity, List<IoStatDayEntity> oldIoStatDayEntity,DateTime yesterday){
 
         // 计算出两个集合之间产品批次号组成的差异
         List<IoStatDayEntity> IoStatDayEntityList = oldIoStatDayEntity.stream()
@@ -252,10 +252,12 @@ public class IoStatDayServiceImpl implements IoStatDayService {
                 }).collect(Collectors.toList());
 
         for (IoStatDayEntity ioStatDayEntity : IoStatDayEntityList) {
+            DateTime twoDay = DateUtil.offsetDay(new Date(), -2);
             ioStatDayEntity.setId(null);
             ioStatDayEntity.setBeginCount(ioStatDayEntity.getBalanceCount());
             ioStatDayEntity.setBalanceAmount(ioStatDayEntity.getBalanceAmount());
             ioStatDayEntity.setBeginPrice(ioStatDayEntity.getBalancePrice());
+            ioStatDayEntity.setDay(yesterday.dayOfMonth());
             ioStatDayEntity.setInCount(0);
             ioStatDayEntity.setOutCount(0);
         }

src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java

@@ -101,7 +101,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
             ew.eq("quarter", twoDay.quarter());
             ew.eq("month", twoDay.monthBaseOne()-2);
             List<IoStatMonthEntity> ioStatMonthEntityList=statMonthDao.selectList(ew);
-            List<IoStatMonthEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatMonthEntityList);
+            List<IoStatMonthEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatMonthEntityList,lastMonth);
             dataList.addAll(newOrOldDate);
 
             //插入汇总记录
@@ -257,7 +257,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
         return wrapper;
     }
 
-    private List<IoStatMonthEntity> getNewOrOldDate(List<IoStatMonthEntity> newIoStatDayEntity, List<IoStatMonthEntity> oldIoStatDayEntity) {
+    private List<IoStatMonthEntity> getNewOrOldDate(List<IoStatMonthEntity> newIoStatDayEntity, List<IoStatMonthEntity> oldIoStatDayEntity, DateTime lastMonth) {
 
         // 计算出两个集合之间产品批次号组成的差异
 //        List<IoStatMonthEntity> ioStatMonthEntityList = oldIoStatDayEntity.stream().filter(notComment -> {
@@ -278,6 +278,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
         for (IoStatMonthEntity ioStatDayEntity : ioStatMonthEntityList) {
             ioStatDayEntity.setId(null);
             ioStatDayEntity.setBeginCount(ioStatDayEntity.getBalanceCount());
+            ioStatDayEntity.setMonth(lastMonth.monthBaseOne());
             ioStatDayEntity.setBalanceAmount(ioStatDayEntity.getBalanceAmount());
             ioStatDayEntity.setBeginPrice(ioStatDayEntity.getBalancePrice());
             ioStatDayEntity.setInCount(0);