Răsfoiți Sursa

库存bug修改

24282 1 an în urmă
părinte
comite
56913c0cfb

+ 2 - 0
sd-business/src/main/java/com/sd/business/scheduled/InventoryBackupTask.java

@@ -3,9 +3,11 @@ package com.sd.business.scheduled;
 
 import com.sd.business.service.inventory.InventoryBackupService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+@Profile({"test", "prod"})
 @Component
 public class InventoryBackupTask {
 

+ 3 - 2
sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryBackupServiceImpl.java

@@ -56,9 +56,10 @@ public class InventoryBackupServiceImpl extends ServiceImpl<InventoryBackupMappe
     public Page<InventoryBackupVo> getPage(InventorySelectDto dto) {
 
         IWrapper<InventoryBackup> wrapper = getWrapper();
-        wrapper.orderByDesc("ib", InventoryBackup::getId);
         wrapper.ge("ib", InventoryBackup::getBackupDate, dto.getBeginTime());
         wrapper.le("ib", InventoryBackup::getBackupDate, dto.getEndTime());
+        wrapper.orderByDesc("ib", InventoryBackup::getId);
+        wrapper.groupBy("ib.backup_date");
 
         Page<InventoryBackupVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         List<InventoryBackupVo> records = page.getRecords();
@@ -67,8 +68,8 @@ public class InventoryBackupServiceImpl extends ServiceImpl<InventoryBackupMappe
         }
 
         for (InventoryBackupVo record : records) {
-            record.setBackupDate(DateUtil.offsetDay(record.getBackupDate(), 1));
             record.setBackupDateStr(DateUtil.format(record.getBackupDate(), "yyyy-MM-dd"));
+            record.setBackupDate(DateUtil.offsetDay(record.getBackupDate(), 1));
         }
         return page;
     }