Merge branch 'develop-16542' into 'develop'

组织机构测试

See merge request !360

project-order/src/main/java/com/dituhui/pea/order/controller/TestController.java

 package com.dituhui.pea.order.controller;
 package com.dituhui.pea.order.controller;
 
 
+import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.service.impl.BeanRemoteServiceImpl;
 import com.dituhui.pea.order.service.impl.BeanRemoteServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -18,8 +19,8 @@ public class TestController {
 
 
 
 
     @GetMapping("/test")
     @GetMapping("/test")
-    public void test() {
-        beanRemoteServiceImpl.testAllDepartment();
+    public Result<?> test() {
+        return beanRemoteServiceImpl.allDepartment();
     }
     }
 
 
 }
 }

project-order/src/main/java/com/dituhui/pea/order/scheduler/CalcEngineerCapacityScheduler.java

@@ -29,6 +29,7 @@ import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Comparator;
@@ -161,6 +162,8 @@ public class CalcEngineerCapacityScheduler {
             }
             }
             sliceCap.setCapLeft(sliceCap.getCapTotal() - totalUseTime);
             sliceCap.setCapLeft(sliceCap.getCapTotal() - totalUseTime);
             sliceCap.setMaxDuration(sliceCap.getCapTotal() - totalUseTime);
             sliceCap.setMaxDuration(sliceCap.getCapTotal() - totalUseTime);
+            sliceCap.setCapUsed(totalUseTime);
+            sliceCap.setUpdateTime(LocalDateTime.now(ZoneId.of("+8")));
         }
         }
         engineerSliceUsedCapacityDao.saveAll(engineerTimeSlice);
         engineerSliceUsedCapacityDao.saveAll(engineerTimeSlice);
     }
     }