Newspaper 1 ano atrás
pai
commit
90cfddaf67

+ 4 - 4
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EggProductionController.java

@@ -47,10 +47,10 @@ public class EggProductionController {
 
             EggProduction eggProduction2 = new EggProduction();
             eggProduction2.setStartTime(LocalTime.NOON);
-            eggProduction2.setEndTime(LocalTime.MAX);
+            eggProduction2.setEndTime(LocalTime.MAX.minusSeconds(1));
             eggProduction2.setEventType(1);
             eggProduction2.setFarmId(Integer.valueOf(farmId));
-            eggProductions.add(eggProduction1);
+            eggProductions.add(eggProduction2);
             eggProductionService.saveBatch(eggProductions);
         }
         return new Result(ResultCode.SUCCESS,eggProductions);
@@ -61,11 +61,11 @@ public class EggProductionController {
         List<EggProduction> list = eggProductionDto.getList();
         EggProduction eggProduction1 = list.stream().filter(eggProduction -> eggProduction.getEventType().equals(0)).findFirst().orElse(null);
         if (eggProduction1.getStartTime().isAfter(eggProduction1.getEndTime())){
-            return new Result(10001,"起始时间不能晚于结束时间",false);
+            return new Result(10001,"捡蛋起始时间不能晚于结束时间",false);
         }
         EggProduction eggProduction2 = list.stream().filter(eggProduction -> eggProduction.getEventType().equals(1)).findFirst().orElse(null);
         if (eggProduction2.getStartTime().isAfter(eggProduction2.getEndTime())){
-            return new Result(10001,"起始时间不能晚于结束时间",false);
+            return new Result(10001,"上料起始时间不能晚于结束时间",false);
         }
         if (isTimeOverlap(eggProduction1.getStartTime(),eggProduction1.getEndTime(),eggProduction2.getStartTime(),eggProduction2.getEndTime())) {
             return new Result(10001,"存在时间重叠",false);