Commit d549c9e0 authored by nie'hong's avatar nie'hong

测试

parent 9aec99f6
...@@ -49,10 +49,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -49,10 +49,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
private WorkDeptService workDeptService; private WorkDeptService workDeptService;
@Autowired @Autowired
private WorkTimeOrderService workTimeOrderService; private WorkSubmitAdoptService workSubmitAdoptService;
@Autowired
private WorkSubmitAdoptService workSbumitAdoptService;
@Autowired @Autowired
private WorkHolidayService workHolidayService; private WorkHolidayService workHolidayService;
...@@ -528,7 +525,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -528,7 +525,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
log.info("WorkOrderServiceImpl[]checkWorkOrderInfo[]input.method"); log.info("WorkOrderServiceImpl[]checkWorkOrderInfo[]input.method");
// 1、工单时间不能大于当前天 // 1、工单时间不能大于当前天
Date date = new Date(); Date date = new Date();
WorkSubmitAdopt workSubmitAdopt = workSbumitAdoptService.getById(1); WorkSubmitAdopt workSubmitAdopt = workSubmitAdoptService.getById(1);
Integer submitTime = workSubmitAdopt.getSubmitTime(); Integer submitTime = workSubmitAdopt.getSubmitTime();
for (WorkTimeOrderDto dto : list) { for (WorkTimeOrderDto dto : list) {
if (null == dto.getDes()) { if (null == dto.getDes()) {
...@@ -589,7 +586,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -589,7 +586,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
// 驳回重新填报 // 驳回重新填报
private void reSubmit(List<WorkTimeOrderDto> workTimeOrders) { private void reSubmit(List<WorkTimeOrderDto> workTimeOrders) {
WorkSubmitAdopt workSubmitAdopt = workSbumitAdoptService.getById(1); WorkSubmitAdopt workSubmitAdopt = workSubmitAdoptService.getById(1);
Integer submitTime = workSubmitAdopt.getSubmitTime(); Integer submitTime = workSubmitAdopt.getSubmitTime();
for (WorkTimeOrderDto workTimeOrderDto : workTimeOrders) { for (WorkTimeOrderDto workTimeOrderDto : workTimeOrders) {
if (null == workTimeOrderDto.getDes()) { if (null == workTimeOrderDto.getDes()) {
......
...@@ -48,7 +48,7 @@ public class WorkUserServiceImpl implements WorkUserService { ...@@ -48,7 +48,7 @@ public class WorkUserServiceImpl implements WorkUserService {
} }
WorkUser workUser = workUserMapper.selectById(id); WorkUser workUser = workUserMapper.selectById(id);
if (null == workUser) { if (null == workUser) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.DEPT_NOT_HAVE_USER); throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_USER_INFO_FAIL);
} }
return workUser; return workUser;
} }
......
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