Commit 7a578370 authored by cq990612's avatar cq990612

优化代码结构

parent ff9876c7
...@@ -49,7 +49,7 @@ public enum BASE_RESP_CODE_ENUM { ...@@ -49,7 +49,7 @@ public enum BASE_RESP_CODE_ENUM {
WORK_DAY_THAN_DATE("627","超过3天的工单不能补报"), WORK_DAY_THAN_DATE("627","超过3天的工单不能补报"),
DES_NOT_NULL("628","工作简述不能为空"), DES_NOT_NULL("628","工作简述不能为空"),
WORK_PROJECT_IS_NULL("629","项目为空"), WORK_PROJECT_IS_NULL("629","项目为空"),
WORK_ORDER_END("630", "该项目的工单已经全部审批"), WORK_ORDER_END("630", "该项目暂无待审批工单"),
DEPT_IS_NULL("631","该部门不存在"), DEPT_IS_NULL("631","该部门不存在"),
MANAGER_NOT_PROJECT("632","该管理没有可管理的项目"), MANAGER_NOT_PROJECT("632","该管理没有可管理的项目"),
DEPT_NOT_FOUND("633", "部门信息未找到"), DEPT_NOT_FOUND("633", "部门信息未找到"),
...@@ -64,6 +64,7 @@ public enum BASE_RESP_CODE_ENUM { ...@@ -64,6 +64,7 @@ public enum BASE_RESP_CODE_ENUM {
NOT_MANAGER_TYPE("642","没有可以管理的类型项目"), NOT_MANAGER_TYPE("642","没有可以管理的类型项目"),
HAVE_ORDER_DELETE("643", "有工单被用户删除,审批失败,请重新审批"), HAVE_ORDER_DELETE("643", "有工单被用户删除,审批失败,请重新审批"),
ORDER_EXAMINE("644","该工单已经被审批,请刷新查看"), ORDER_EXAMINE("644","该工单已经被审批,请刷新查看"),
NO_WORK_ORDERS_HAVE_BEEN_REJECTED("645", "暂无驳回未提交工单"),
; ;
......
...@@ -274,8 +274,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -274,8 +274,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
continue; continue;
} }
} }
BeanUtils.copyProperties(workTimeOrder, dto); BeanUtils.copyProperties(workTimeOrder, dto);
addList.add(workTimeOrder); addList.add(workTimeOrder);
} }
...@@ -589,7 +587,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -589,7 +587,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
wrapper.orderByDesc("work_day"); wrapper.orderByDesc("work_day");
List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.selectList(wrapper); List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.selectList(wrapper);
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.NO_WORK_ORDERS_HAVE_BEEN_REJECTED);
} }
return wtoToWtod(workTimeOrders); return wtoToWtod(workTimeOrders);
} }
......
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