Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
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
f23879f0
Commit
f23879f0
authored
Mar 08, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善工时统计
parent
7b60811d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
StatisticsServiceImpl.java
...java/cn/wisenergy/service/impl/StatisticsServiceImpl.java
+5
-5
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java
View file @
f23879f0
...
...
@@ -743,10 +743,10 @@ public class StatisticsServiceImpl implements StatisticsService {
List
<
WorkLevel
>
workLevels
=
UserRoleLevelUtils
.
getlevelByIds
(
list
);
List
<
Integer
>
rank
=
this
.
getUserRank
(
workLevels
,
LevelEnum
.
PROJECT_STATISTICS
.
getLevelName
());
// 非中心级不能选择部门
if
(!
rank
.
contains
(
LevelRankEnum
.
CENTRAL_LEVEL
.
getRank
())
&&
deptId
!=
null
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
NO_AUTHORITY
);
}
//
// 非中心级不能选择部门
//
if (!rank.contains(LevelRankEnum.CENTRAL_LEVEL.getRank()) && deptId != null) {
//
throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_AUTHORITY);
//
}
// 默认查询时间为当前
if
(
year
==
null
)
{
...
...
@@ -847,7 +847,7 @@ public class StatisticsServiceImpl implements StatisticsService {
startDate
=
projectStatisticsByMonths
.
get
(
0
).
getStatisticsDateAndWorkTimes
().
get
(
0
).
getDate
();
endDate
=
workProjectMapper
.
getLastDate
(
projectId
);
}
else
{
if
(
year
<
DateUtil
.
getYear
(
new
Date
()))
{
if
(
year
!=
DateUtil
.
getYear
(
new
Date
()))
{
startDate
=
year
+
"年1月"
;
endDate
=
year
+
"年12月"
;
}
else
{
...
...
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