he2802 2 years ago
parent
commit
412f3ed27f

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3675,6 +3675,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(day,"yyyy-MM-dd"));
                 if(voList.size()>0){
                     twoVo.setCreateUsername(voList.get(0).getCreateUsername());
+                    twoVo.setTenantName(voList.get(0).getTenantName());
                 }
                 if (voList.stream().anyMatch(x -> DateUtils.getScheduleTimeStrZeroTime(x.getTimeStr(), "yyyy-MM-dd").equals(day))){
                     TopOrderStatisticsTwoVo statisticsTwoVo = voList.stream()
@@ -3700,6 +3701,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM-dd"));
                 if(voList2.size()>0){
                     twoVo.setCreateUsername(voList2.get(0).getCreateUsername());
+                    twoVo.setTenantName(voList2.get(0).getTenantName());
                 }
                 if (voList2.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
@@ -3729,6 +3731,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM"));
                 if(voList3.size()>0){
                     twoVo.setCreateUsername(voList3.get(0).getCreateUsername());
+                    twoVo.setTenantName(voList3.get(0).getTenantName());
                 }
                 if (voList3.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
@@ -3848,6 +3851,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM"));
                 if(voList3.size()>0){
                     twoVo.setCreateUsername(voList3.get(0).getCreateUsername());
+                    twoVo.setTenantName(voList3.get(0).getTenantName());
                 }
                 if (voList3.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time