Commit 1b884197 authored by cq990612's avatar cq990612

优化代码结构

parent 1b87a152
...@@ -74,6 +74,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -74,6 +74,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
@Override @Override
public List<WorkTimeOrder> getByDay(Integer userId, Date workDay) { public List<WorkTimeOrder> getByDay(Integer userId, Date workDay) {
log.info("WorkTimeOrderServiceImpl[]getByDay[]input.param.userId:{},workDay:{}" + userId, workDay); log.info("WorkTimeOrderServiceImpl[]getByDay[]input.param.userId:{},workDay:{}" + userId, workDay);
if (null == userId || null == workDay) { if (null == userId || null == workDay) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
} }
...@@ -136,6 +137,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -136,6 +137,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
@Override @Override
public List<WorkTimeOrder> getByDayToDto(Integer userId, Date workDay) { public List<WorkTimeOrder> getByDayToDto(Integer userId, Date workDay) {
log.info("WorkTimeOrderServiceImpl[]getByDayToDto[]input.param.userId:{},workDay:{}" + userId, workDay); log.info("WorkTimeOrderServiceImpl[]getByDayToDto[]input.param.userId:{},workDay:{}" + userId, workDay);
List<WorkTimeOrder> workTimeOrders = getByDay(userId, workDay); List<WorkTimeOrder> workTimeOrders = getByDay(userId, workDay);
if (CollectionUtils.isEmpty(workTimeOrders)) { if (CollectionUtils.isEmpty(workTimeOrders)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL);
...@@ -183,10 +185,10 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -183,10 +185,10 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
List<WorkTimeOrderDto> workTimeOrders = dto.getWorkTimeOrders(); List<WorkTimeOrderDto> workTimeOrders = dto.getWorkTimeOrders();
// 判断是否超过8小时 // 判断是否超过8小时
int count = 0; int count = 0;
List<WorkTimeOrder> byDayToDto = getByDayToDto(workTimeOrders.get(0).getUserId(), workTimeOrders.get(0).getWorkDay()); List<WorkTimeOrder> byDayToDto = getByDayToDto(workTimeOrders.get(0).getUserId(), workTimeOrders.get(0).getWorkDay());
// 判断是否重复填报 // 判断是否重复填报
isRepeat(workTimeOrders); isRepeat(workTimeOrders);
for (WorkTimeOrder orderDto : byDayToDto) { for (WorkTimeOrder orderDto : byDayToDto) {
if (2 == orderDto.getStatus() || 5 == orderDto.getStatus()) { if (2 == orderDto.getStatus() || 5 == orderDto.getStatus()) {
count += orderDto.getWorkTime(); count += orderDto.getWorkTime();
...@@ -208,8 +210,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -208,8 +210,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
timeNotEight(count, workTimeOrders); timeNotEight(count, workTimeOrders);
// 更新数据 // 更新数据
reSubmit(workTimeOrders);
return dto.getWorkTimeOrders(); return reSubmit(workTimeOrders);
} }
...@@ -461,7 +463,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -461,7 +463,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
} }
} }
projectsDto.setProjectManagerDto(projectManagerDtos); projectsDto.setProjectManagerDto(projectManagerDtos);
return projectsDto; return projectsDto;
...@@ -508,8 +509,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -508,8 +509,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
BeanUtils.copyProperties(workProject, projectDto); BeanUtils.copyProperties(workProject, projectDto);
// 获取项目管理 // 获取项目管理
projectDto.setManagerName(workUserService.getById(workProject.getManagerId()).getName()); projectDto.setManagerName(workUserService.getById(workProject.getManagerId()).getName());
return projectDto; return projectDto;
} }
...@@ -623,7 +622,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -623,7 +622,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
} }
// 驳回重新填报 // 驳回重新填报
private void reSubmit(List<WorkTimeOrderDto> workTimeOrders) { private List<WorkTimeOrderDto> reSubmit(List<WorkTimeOrderDto> workTimeOrders) {
WorkSubmitAdopt workSubmitAdopt = workSubmitAdoptService.getById(1); WorkSubmitAdopt workSubmitAdopt = workSubmitAdoptService.getById(1);
Integer submitTime = workSubmitAdopt.getSubmitTime(); Integer submitTime = workSubmitAdopt.getSubmitTime();
for (WorkTimeOrderDto workTimeOrderDto : workTimeOrders) { for (WorkTimeOrderDto workTimeOrderDto : workTimeOrders) {
...@@ -639,17 +638,22 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -639,17 +638,22 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
if (new Date().getTime() - DateUtil.getStartOfDay(modifyTime).getTime() > submitTime * 24 * 60 * 60 * 1000) { if (new Date().getTime() - DateUtil.getStartOfDay(modifyTime).getTime() > submitTime * 24 * 60 * 60 * 1000) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE); throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE);
} }
workTimeOrderDto.setStatus(4);
WorkTimeOrder workTimeOrder = new WorkTimeOrder(); WorkTimeOrder workTimeOrder = new WorkTimeOrder();
BeanUtils.copyProperties(workTimeOrderDto, workTimeOrder); BeanUtils.copyProperties(workTimeOrderDto, workTimeOrder);
workTimeOrder.setStatus(4);
/* // 获取用户名 // 获取用户名
workTimeOrder.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName()); workTimeOrderDto.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName());
// 获取项目名 // 获取项目名
if (1 == workTimeOrder.getType() || 2 == workTimeOrder.getType()) { if (1 == workTimeOrder.getType() || 2 == workTimeOrder.getType()) {
workTimeOrder.setProjectName(workProjectService.getById(workTimeOrder.getProjectId()).getProjectName()); workTimeOrderDto.setProjectName(workProjectService.getById(workTimeOrder.getProjectId()).getProjectName());
}*/ }
// 获取类型名
workTimeOrderDto.setTypeName(getTypeName(workTimeOrderDto.getType()));
// 获取部门id // 获取部门id
Integer deptIdByUserId = workUserDeptService.getDeptIdByUserId(workTimeOrder.getUserId()); Integer deptIdByUserId = workUserDeptService.getDeptIdByUserId(workTimeOrder.getUserId());
workTimeOrder.setDeptId(deptIdByUserId); workTimeOrder.setDeptId(deptIdByUserId);
Date workDay = workTimeOrder.getWorkDay(); Date workDay = workTimeOrder.getWorkDay();
// 默认正常工时 // 默认正常工时
...@@ -667,6 +671,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -667,6 +671,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
workCollect.setTotalTime(workTimeOrder.getWorkTime()); workCollect.setTotalTime(workTimeOrder.getWorkTime());
workCollectService.update(workCollect); workCollectService.update(workCollect);
} }
return workTimeOrders;
} }
private List<WorkTimeOrderDto> saveWorkOrderInfo(List<WorkTimeOrderDto> list) { private List<WorkTimeOrderDto> saveWorkOrderInfo(List<WorkTimeOrderDto> list) {
......
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