Merge branch 'dev_dispatch_filter0711' into 'develop'

新增派工台统计接口

See merge request !211

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.function.BooleanSupplier;
 
 
 @RestController
 @RestController
 @RequestMapping("/pea-order")
 @RequestMapping("/pea-order")
@@ -18,6 +19,17 @@ public class ScheduleController {
 	@Autowired
 	@Autowired
 	private ScheduleService scheduleService;
 	private ScheduleService scheduleService;
 
 
+	@GetMapping("/schedule/summary")
+	public Result<?> getScheduleSummary(@RequestParam String date, @RequestParam String levelType, @RequestParam("levelValue") List<String> levelIds){
+		Result<?> res = null;
+		try {
+			res = scheduleService.getScheduleSummary(date, levelType, levelIds);
+		} catch(BusinessException e) {
+			return Result.failed(e.getMessage());
+		}
+		return res;
+	}
+
 	@GetMapping("/schedule/overview")
 	@GetMapping("/schedule/overview")
 	public Result<?> getScheduleOverview(@RequestParam long page, @RequestParam long size, @RequestParam String date,
 	public Result<?> getScheduleOverview(@RequestParam long page, @RequestParam long size, @RequestParam String date,
 										 @RequestParam String levelType, @RequestParam("levelValue") List<String> levelIds) {
 										 @RequestParam String levelType, @RequestParam("levelValue") List<String> levelIds) {

project-order/src/main/java/com/dituhui/pea/order/service/ScheduleService.java

@@ -5,6 +5,9 @@ import com.dituhui.pea.common.Result;
 import java.util.List;
 import java.util.List;
 
 
 public interface ScheduleService {
 public interface ScheduleService {
+
+	Result<?> getScheduleSummary(String date, String levelType, List<String> levelIds);
+
 	Result<?> getScheduleOverview(long page, long size, String date, String levelType, List<String> levelIds);
 	Result<?> getScheduleOverview(long page, long size, String date, String levelType, List<String> levelIds);
 
 
 	Result<?> getScheduleEngineerOverview(String date, String engineerCode);
 	Result<?> getScheduleEngineerOverview(String date, String engineerCode);

project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java

@@ -45,6 +45,11 @@ public class ScheduleServiceImpl implements ScheduleService {
 	private EngineerInfoMPDao engineerInfoMPDao;
 	private EngineerInfoMPDao engineerInfoMPDao;
 
 
 	@Override
 	@Override
+	public Result<?> getScheduleSummary(String date, String levelType, List<String> levelIds) {
+		return null;
+	}
+
+	@Override
 	public Result<?> getScheduleOverview(long page, long size, String date, String levelType, List<String> levelIds) {
 	public Result<?> getScheduleOverview(long page, long size, String date, String levelType, List<String> levelIds) {
 
 
 		// 获取team列表
 		// 获取team列表