Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
work_service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
work_service
Commits
7a578370
Commit
7a578370
authored
Jan 30, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
ff9876c7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
BASE_RESP_CODE_ENUM.java
...wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java
+2
-1
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+1
-3
No files found.
wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java
View file @
7a578370
...
@@ -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"
,
"暂无驳回未提交工单"
),
;
;
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
7a578370
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment