Commit 423af476 by 丁伟峰

持续完善

1 parent 9eb4f183
package com.alibaba.cloud.integration.order.dto;
@lombok.Data
public class WorkbenchEngineersGanttReqDTO {
private String levelType;
private String levelValue;
private Integer page;
private Integer size;
private String date;
/**
* 技术员ID列表,即使只有一个,也必须["en001"]这样的格式
*/
private String[] engineerCodes;
}
package com.alibaba.cloud.integration.order.dto;
@lombok.Data
public class WorkbenchEngineersGanttRespDTO {
private String date;
private GanttChart[] engineers;
/**
* GanttChart
*/
@lombok.Data
public static class GanttChart {
/**
* 下班时间
*/
private String endTime;
/**
* 工程师工号
*/
private String engineerCode;
/**
* 延误原因展示说明
*/
private String errorTip;
/**
* 是否休假
*/
private boolean isHoliday;
/**
* 上班时间
*/
private String startTime;
private Timeline[] timeline;
}
@lombok.Data
public static class Timeline {
/**
* 结束时间
*/
private String endTime;
/**
* 服务单ID
*/
private String serviceOrderId;
/**
* 服务单状态值
*/
private String serviceOrderStatus;
/**
* 开始时间
*/
private String startTime;
private Tip[] tips;
}
@lombok.Data
public static class Tip {
private String desc;
private String title;
}
}
...@@ -20,22 +20,22 @@ import java.util.List; ...@@ -20,22 +20,22 @@ import java.util.List;
public class OrganizationServiceImpl implements OrganizationService { public class OrganizationServiceImpl implements OrganizationService {
@Autowired @Autowired
OrgClusterDao orgClusterDao; private OrgClusterDao orgClusterDao;
@Autowired @Autowired
OrgBranchDao orgBranchDao; private OrgBranchDao orgBranchDao;
@Autowired @Autowired
OrgGroupDao orgGroupDao; private OrgGroupDao orgGroupDao;
@Autowired @Autowired
OrgTeamEngineerDao orgTeamEngineerDao; private OrgTeamEngineerDao orgTeamEngineerDao;
@Autowired @Autowired
EngineerInfoDao engineerInfoDao; private EngineerInfoDao engineerInfoDao;
@Autowired @Autowired
OrgTeamDao orgTeamDao; private OrgTeamDao orgTeamDao;
@Override @Override
public Result<?> getOrganizationTree(String levelType, String levelId) { public Result<?> getOrganizationTree(String levelType, String levelId) {
......
...@@ -22,10 +22,10 @@ import java.util.List; ...@@ -22,10 +22,10 @@ import java.util.List;
public class WorkbenchServiceImpl implements WorkbenchService { public class WorkbenchServiceImpl implements WorkbenchService {
@Autowired @Autowired
OrderChangeDao orderChangeDao; private OrderChangeDao orderChangeDao;
@Autowired @Autowired
OrderRequestDao orderRequestDao; private OrderRequestDao orderRequestDao;
@Override @Override
public Result<?> getOrderChangeList(String levelType, String levelId, int page, int pageSize) { public Result<?> getOrderChangeList(String levelType, String levelId, int page, int pageSize) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!