Commit 836ed73c by 丁伟峰

Merge branch 'feat-dingwf-mvp616' into develop

2 parents 105a3976 3bb44cb2
......@@ -56,9 +56,9 @@ public class WorkbenchEngineersGanttRespDTO {
*/
private String orderId;
/**
* 工单状态值
* 排班状态
*/
private String orderStatus;
private String preStatus;
/**
* 派单状态
*/
......
......@@ -53,7 +53,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
@Override
public Result<?> getOneCapacityData(CapacityOrderQueryReqDTO reqDTO) {
// 单条容量查询
log.info("===> getOneCapacityData");
log.info("===> getOneCapacityData()");
String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(reqDTO.getBrand(), reqDTO.getType(), reqDTO.getSkill());
String teamId = commonService.getTeamIdByInput(reqDTO.getLocation(), reqDTO.getAddress(), layer);
log.info("teamId[{}]layer[{}]", teamId, layer);
......@@ -80,12 +80,15 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getPageSize());
if ("cluster".equals(reqDTO.getLevelType())) {
List<String> branchIds = getBranchIdsByClusterId(reqDTO.getLevelValue());
log.info("levelType: {} ==> branchIds: {}", reqDTO.getLevelType(), branchIds);
stats = capacityOrgStatDao.findByBranchIdsAndWorkdayBetween(branchIds, reqDTO.getBeginDate(), reqDTO.getEndDate(), pageable);
} else if ("branch".equals(reqDTO.getLevelType())) {
List<String> groupIds = getGroupIdsByBranchId(reqDTO.getLevelValue());
log.info("levelType: {} ==> groupIds: {}", reqDTO.getLevelType(), groupIds);
stats = capacityOrgStatDao.findByGroupIdsAndWorkdayBetween(groupIds, reqDTO.getBeginDate(), reqDTO.getEndDate(), pageable);
} else {
List<String> teamIds = getTeamIdsByGroupId(reqDTO.getLevelValue());
log.info("levelType: {} ==> teamIds: {}", reqDTO.getLevelType(), teamIds);
stats = capacityTeamStatDao.findByTeamIdsAndWorkdayBetween(teamIds, reqDTO.getBeginDate(), reqDTO.getEndDate(), pageable);
}
CapacityStatQueryRespDTO data = new CapacityStatQueryRespDTO();
......
......@@ -84,7 +84,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
WorkbenchEngineersGanttRespDTO.Order order = new WorkbenchEngineersGanttRespDTO.Order();
// todo 需要根据订单时间和状态,采用expectXXXX或者actualXXXX
order.setStartTime(e.getExpectStartTime()).setEndTime(e.getExpectEndTime());
order.setOrderId(e.getOrderId()).setOrderStatus(e.getStatus());
order.setOrderId(e.getOrderId()).setPreStatus(e.getPreStatus());
order.setTips(getOrderTips(e.getOrderId()));
order.setAppointmentStatus(mapOrderRequest.get(e.getOrderId()).getAppointmentStatus());
List<WorkbenchEngineersGanttRespDTO.Order> orders = null;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!