mapper 修改

src/main/java/com/gogirl/application/order/serve/ScheduleManageService.java

@@ -144,5 +144,5 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
                                                         String scheduleDate,
                                                         List<Integer> serveIdList) throws ParseException;
 
-    StoreTechnician queryLeisureTechnician(Integer departmentId, Integer serveId, LocalDateTime serveStartTime, LocalDateTime serveEndTime);
+    StoreTechnician queryLeisureTechnician(Integer departmentId, Integer serveId, LocalDateTime serveStartTime, LocalDateTime serveEndTime) throws ParseException;
 }

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -57,6 +57,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
@@ -203,10 +204,15 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     }
 
     @Override
-    public StoreTechnician queryLeisureTechnician(Integer departmentId, Integer serveId, LocalDateTime serveStartTime, LocalDateTime serveEndTime) {
-//        this.storeTechnicianQueryList(null,departmentId)
-
-        return null;
+    public StoreTechnician queryLeisureTechnician(Integer departmentId, Integer serveId, LocalDateTime serveStartTime, LocalDateTime serveEndTime) throws ParseException {
+        List<StoreTechnicianQuery> storeTechnicianQueryList = this.storeTechnicianQueryList(null, departmentId, serveStartTime.toLocalDate().toString(), Lists.newArrayList(serveId));
+        Period servePeriod = new Period(serveStartTime.toInstant(ZoneOffset.of("+8")).toEpochMilli(),
+                serveEndTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
+        StoreTechnicianQuery query = storeTechnicianQueryList.stream().filter(storeTechnicianQuery -> !storeTechnicianQuery.getPeriodList().stream().map(period -> period.conflict(servePeriod))
+                .collect(Collectors.toList()).contains(true))
+                .findAny().orElse(null);
+        StoreTechnician storeTechnician = storeTechnicianMapper.selectById(query.getTechnicianId());
+        return storeTechnician;
     }
 
 

src/main/java/com/gogirl/domain/store/career/Career.java

@@ -26,6 +26,8 @@ public class Career {
 
     private String technicianName;
 
+    private Integer score;
+
     @ApiModelProperty("加入gogirl时间")
     private Date joinDate;
 

src/main/java/com/gogirl/interfaces/order/serve/ScheduleManageController.java

@@ -240,10 +240,10 @@ public class ScheduleManageController {
     public JsonResult<StoreTechnician> queryLeisureTechnician(@RequestParam Integer departmentId,
                                                               @RequestParam Integer serveId,
                                                               @RequestParam LocalDateTime serveStartTime,
-                                                              @RequestParam LocalDateTime serveEndTime) {
+                                                              @RequestParam LocalDateTime serveEndTime) throws ParseException {
 
         StoreTechnician storeTechnician = scheduleManageService.queryLeisureTechnician(departmentId, serveId, serveStartTime, serveEndTime);
-        return JsonResult.success();
+        return JsonResult.success(storeTechnician);
     }