Commit 5e5f3411 by 丁伟峰

修订

1 parent 3548158f
...@@ -60,9 +60,9 @@ public class WorkbenchEngineersGanttRespDTO { ...@@ -60,9 +60,9 @@ public class WorkbenchEngineersGanttRespDTO {
*/ */
private String orderStatus; private String orderStatus;
/** /**
* 工单状态描述 * 派单状态
*/ */
private String orderStatusDesc; private String appointmentStatus;
/** /**
* 开始时间 * 开始时间
*/ */
......
...@@ -44,7 +44,7 @@ public class RequestInterceptor implements HandlerInterceptor { ...@@ -44,7 +44,7 @@ public class RequestInterceptor implements HandlerInterceptor {
// 打印请求的 IP // 打印请求的 IP
log.info("Request IP : {}", request.getRemoteAddr()); log.info("Request IP : {}", request.getRemoteAddr());
// 打印请求入参 // 打印请求入参
log.info("Request Args : {}", joinPoint.getArgs()); log.info("Request Args : {}", new ObjectMapper().writeValueAsString(joinPoint.getArgs()));
} }
/** /**
......
...@@ -83,7 +83,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { ...@@ -83,7 +83,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
order.setStartTime(entity.getExpectStartTime()).setEndTime(entity.getExpectEndTime()); order.setStartTime(entity.getExpectStartTime()).setEndTime(entity.getExpectEndTime());
order.setOrderId(entity.getOrderId()).setOrderStatus(entity.getStatus()); order.setOrderId(entity.getOrderId()).setOrderStatus(entity.getStatus());
order.setTips(getOrderTips(entity.getOrderId())); order.setTips(getOrderTips(entity.getOrderId()));
//todo 查询order-request表,获取 appointment_status字段
List<WorkbenchEngineersGanttRespDTO.Order> orders = null; List<WorkbenchEngineersGanttRespDTO.Order> orders = null;
if (mapEngineers.containsKey(entity.getEngineerCode())) { if (mapEngineers.containsKey(entity.getEngineerCode())) {
orders = mapEngineers.get(entity.getEngineerCode()); orders = mapEngineers.get(entity.getEngineerCode());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!