Commit ff0203d6 by wangli

合并代码

1 parent e4422c37
......@@ -28,9 +28,6 @@ import java.util.Map;
public class WorkbenchServiceImpl implements WorkbenchService {
@Autowired
private OrderChangeDao orderChangeDao;
@Autowired
private OrderRequestDao orderRequestDao;
@Autowired
......@@ -43,6 +40,10 @@ public class WorkbenchServiceImpl implements WorkbenchService {
private CapacityEngineerStatDao capacityEngineerStatDao;
@Autowired
private OrderEventDao orderEventDao;
@Autowired
private OrderRequestMPDao orderRequestMPDao;
@Override
......@@ -52,11 +53,11 @@ public class WorkbenchServiceImpl implements WorkbenchService {
String levelType = reqDTO.getLevelType();
String levelValue = reqDTO.getLevelValue();
if ("cluster".equals(levelType)) {
changes = orderChangeDao.findAllByClusterId(levelValue, reqDTO.getDate(), pageable);
changes = orderEventDao.findAllByClusterId(levelValue, reqDTO.getDate(), pageable);
} else if ("branch".equals(levelType)) {
changes = orderChangeDao.findAllByBranchId(levelValue, reqDTO.getDate(), pageable);
changes = orderEventDao.findAllByBranchId(levelValue, reqDTO.getDate(), pageable);
} else {
changes = orderChangeDao.findAllByGroupId(levelValue, reqDTO.getDate(), pageable);
changes = orderEventDao.findAllByGroupId(levelValue, reqDTO.getDate(), pageable);
}
List<OrderChangeListRespDTO.Content> contents = new ArrayList<>();
for (Object e1 : changes.getContent()) {
......@@ -68,7 +69,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
.setOperator(e.getOperator())
.setDescription(e.getContent())
.setMemo(e.getMemo())
.setUpdateTime(e.getUpdateTime().toString());
.setUpdateTime(e.getUpdateTime());
contents.add(content);
}
OrderChangeListRespDTO respDTO = new OrderChangeListRespDTO();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!