修改描述顺序

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

@@ -73,8 +73,8 @@ public class DispatchServiceImpl implements DispatchService {
 			item.setRemark(o.getApplyNote());
 			item.setRemark(o.getApplyNote());
 			item.setCustomerName(o.getName());
 			item.setCustomerName(o.getName());
 
 
-			String description = String.format("%s:%s%s-%s\n%s:%s-%s-%s", o.getOrderId(), o.getSkill(),
-					o.getType(), o.getBrand(), o.getName(), o.getCity(), o.getCounty(), o.getAddress());
+			String description = String.format("%s:%s-%s-%s\n%s:%s-%s-%s", o.getOrderId(), o.getBrand(), o.getType(),
+					o.getSkill(), o.getName(), o.getCity(), o.getCounty(), o.getAddress());
 			item.setDescription(description);
 			item.setDescription(description);
 
 
 			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());
@@ -140,7 +140,7 @@ public class DispatchServiceImpl implements DispatchService {
 
 
 		// 获取服务单/工单列表
 		// 获取服务单/工单列表
 		Map<String, List<OrderRequest>> orders = new HashMap<>();
 		Map<String, List<OrderRequest>> orders = new HashMap<>();
-		if(!orderIds.isEmpty()) {
+		if (!orderIds.isEmpty()) {
 			orders = orderRequestMPDao.selectByOrderIds(new ArrayList<>(orderIds)).stream().collect(
 			orders = orderRequestMPDao.selectByOrderIds(new ArrayList<>(orderIds)).stream().collect(
 					Collectors.groupingBy(OrderRequest::getOrderId));
 					Collectors.groupingBy(OrderRequest::getOrderId));
 		}
 		}
@@ -155,7 +155,7 @@ public class DispatchServiceImpl implements DispatchService {
 			List<OrderAppointment> records = engineerOrders.getOrDefault(e.getEngineerCode(), new ArrayList<>());
 			List<OrderAppointment> records = engineerOrders.getOrDefault(e.getEngineerCode(), new ArrayList<>());
 			for (OrderAppointment r : records) {
 			for (OrderAppointment r : records) {
 				// 获取对应的工单信息
 				// 获取对应的工单信息
-				if (ListUtils.isEmpty(orders.get(r.getOrderId()))){
+				if (ListUtils.isEmpty(orders.get(r.getOrderId()))) {
 					continue;
 					continue;
 				}
 				}
 				OrderRequest o = orders.get(r.getOrderId()).get(0);
 				OrderRequest o = orders.get(r.getOrderId()).get(0);
@@ -289,9 +289,9 @@ public class DispatchServiceImpl implements DispatchService {
 		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());
 
 
-		if(ListUtils.isNotEmpty(reqDTO.getPriorities())) {
+		if (ListUtils.isNotEmpty(reqDTO.getPriorities())) {
 			List<Integer> p = reqDTO.getPriorities();
 			List<Integer> p = reqDTO.getPriorities();
-			if(p.contains(0) && p.contains(1)) {
+			if (p.contains(0) && p.contains(1)) {
 				lqw.ge(OrderRequest::getPriority, 1);
 				lqw.ge(OrderRequest::getPriority, 1);
 			} else if (p.contains(0) && !p.contains(1)) {
 			} else if (p.contains(0) && !p.contains(1)) {
 				lqw.le(OrderRequest::getPriority, 1);
 				lqw.le(OrderRequest::getPriority, 1);
@@ -312,7 +312,7 @@ public class DispatchServiceImpl implements DispatchService {
 			lqw.exists(sql);
 			lqw.exists(sql);
 		}
 		}
 
 
-		if(ListUtils.isNotEmpty(reqDTO.getEngineerCodes())) {
+		if (ListUtils.isNotEmpty(reqDTO.getEngineerCodes())) {
 			String engineerCodes = "'" + String.join("','", reqDTO.getEngineerCodes()) + "'";
 			String engineerCodes = "'" + String.join("','", reqDTO.getEngineerCodes()) + "'";
 			String sql = String.format("select 1 from order_appointment oa where oa.order_id = order_request.order_id and oa.dt = order_request.dt and oa.engineer_code in (%s)", engineerCodes);
 			String sql = String.format("select 1 from order_appointment oa where oa.order_id = order_request.order_id and oa.dt = order_request.dt and oa.engineer_code in (%s)", engineerCodes);
 			lqw.exists(sql);
 			lqw.exists(sql);