Commit 691fd901 authored by cq990612's avatar cq990612

优化代码结构

parent ec6b6e02
......@@ -197,9 +197,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
if (orderDto.getType().equals(workTimeOrder.getType())) {
if (1 == orderDto.getType() || 2 == orderDto.getType() &&
orderDto.getProjectId().equals(workTimeOrder.getProjectId())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
}
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
}
}
......@@ -211,7 +211,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
timeNotEight(count, workTimeOrders);
// 更新数据
return reSubmit(workTimeOrders);
}
......@@ -692,6 +691,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
dto.setProjectManagerName(workUserService.getById(workProjectService.getById(dto.getProjectId()).getManagerId()).getName());
// 获取类型名
dto.setTypeName(getTypeName(dto.getType()));
// 获取部门id
workTimeOrder.setDeptId(workUserDeptService.getDeptIdByUserId(dto.getUserId()));
Date workDay = dto.getWorkDay();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment