Merge remote-tracking branch 'origin/develop' into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/OrderRequest.java

@@ -45,9 +45,6 @@ public class OrderRequest implements Serializable {
 
 
     private String county;
     private String county;
 
 
-    @Column(name = "category_id")
-    private String categoryId;
-
     private String brand;
     private String brand;
 
 
     private String type;
     private String type;

project-dispatch/src/test/java/com/dituhui/pea/dispatch/SolveServiceTest.java

@@ -75,7 +75,7 @@ class SolveServiceTest {
 
 
         DispatchSolution solution = solver.solve(problem);
         DispatchSolution solution = solver.solve(problem);
         solveService.saveSolutionWrp(solution);
         solveService.saveSolutionWrp(solution);
-        extractService.extractDispatchToOrder(groupId, batchNo, true);
+        extractService.extractDispatchToOrder(groupId, batchNo, false);
 
 
 
 
         log.info("testAsync done");
         log.info("testAsync done");

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

@@ -177,8 +177,8 @@ public class DispatchServiceImpl implements DispatchService {
 				String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill());
 				String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill());
 				item.setDuration(skillTakeTime.getOrDefault(key, 30));
 				item.setDuration(skillTakeTime.getOrDefault(key, 30));
 
 
-				String time = TimeUtils.timestamp2DateTime(o.getExpectTimeBegin(), "HH:mm");
-				String timeSlot = this.parseTimeSlot(o.getExpectTimeBegin());
+				String time = TimeUtils.timestamp2DateTime(r.getExpectStartTime(), "HH:mm");
+				String timeSlot = this.parseTimeSlot(r.getExpectStartTime());
 				item.setIntentionTime(String.format("%s/%s", time, timeSlot));
 				item.setIntentionTime(String.format("%s/%s", time, timeSlot));
 
 
 				items.add(item);
 				items.add(item);
@@ -276,6 +276,7 @@ public class DispatchServiceImpl implements DispatchService {
 	private List<OrderRequest> queryOrderRequests(DispatchOrderListReq reqDTO) {
 	private List<OrderRequest> queryOrderRequests(DispatchOrderListReq reqDTO) {
 		// 获取服务单列表
 		// 获取服务单列表
 		LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
+		lqw.eq(OrderRequest::getAppointmentStatus, "NOT_ASSIGNED");
 		lqw.eq(reqDTO.getLevelType().equals("cluster"), OrderRequest::getOrgClusterId, reqDTO.getLevelValue());
 		lqw.eq(reqDTO.getLevelType().equals("cluster"), OrderRequest::getOrgClusterId, reqDTO.getLevelValue());
 		lqw.eq(reqDTO.getLevelType().equals("branch"), OrderRequest::getOrgBranchId, reqDTO.getLevelValue());
 		lqw.eq(reqDTO.getLevelType().equals("branch"), OrderRequest::getOrgBranchId, reqDTO.getLevelValue());
 		lqw.eq(reqDTO.getLevelType().equals("group"), OrderRequest::getOrgGroupId, reqDTO.getLevelValue());
 		lqw.eq(reqDTO.getLevelType().equals("group"), OrderRequest::getOrgGroupId, reqDTO.getLevelValue());
@@ -287,7 +288,6 @@ public class DispatchServiceImpl implements DispatchService {
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getGroupIds()), OrderRequest::getOrgGroupId, reqDTO.getGroupIds());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getGroupIds()), OrderRequest::getOrgGroupId, reqDTO.getGroupIds());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getTeamIds()), OrderRequest::getOrgTeamId, reqDTO.getTeamIds());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getTeamIds()), OrderRequest::getOrgTeamId, reqDTO.getTeamIds());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentType()), OrderRequest::getAppointmentMethod, reqDTO.getAppointmentType());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentType()), OrderRequest::getAppointmentMethod, reqDTO.getAppointmentType());
-		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentStatus()), OrderRequest::getAppointmentStatus, reqDTO.getAppointmentStatus());
 
 
 		if(ListUtils.isNotEmpty(reqDTO.getPriorities())) {
 		if(ListUtils.isNotEmpty(reqDTO.getPriorities())) {
 			List<Integer> p = reqDTO.getPriorities();
 			List<Integer> p = reqDTO.getPriorities();

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

@@ -190,7 +190,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 	private List<WorkbenchSummaryResp.ValueDTO> packValueOrderStatus(HashMap<String, Long> summary) {
 	private List<WorkbenchSummaryResp.ValueDTO> packValueOrderStatus(HashMap<String, Long> summary) {
 		List<WorkbenchSummaryResp.ValueDTO> items = new ArrayList<>();
 		List<WorkbenchSummaryResp.ValueDTO> items = new ArrayList<>();
 
 
-		String urlName = "DispatchBenchManage";
+		String urlName = "";  // 不返回，前端就不跳转了
 		Long assigned = summary.getOrDefault("ASSIGNED", 0L);
 		Long assigned = summary.getOrDefault("ASSIGNED", 0L);
 		Long contacted = summary.getOrDefault("CONTACTED", 0L);
 		Long contacted = summary.getOrDefault("CONTACTED", 0L);
 		Long departed = summary.getOrDefault("DEPARTED", 0L);
 		Long departed = summary.getOrDefault("DEPARTED", 0L);