Merge branch 'dev_bugfix_dispatch' into 'develop'

修改

See merge request !246

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

@@ -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);