Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
4c5df218
Commit
4c5df218
authored
Jul 13, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加申诉统计业务
parent
eaa2b774
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendAppealVo.java
...ls/xhx/module/perform/model/vo/PerformAttendAppealVo.java
+3
-6
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java
.../perform/service/impl/PerformAttendAppealServiceImpl.java
+2
-2
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendAppealVo.java
View file @
4c5df218
package
com.mortals.xhx.module.perform.model.vo
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.perform.model.PerformAttendAppealEntity
;
import
java.util.ArrayList
;
import
java.util.List
;
import
lombok.Data
;
import
com.mortals.framework.annotation.Excel
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
* 绩效记录申诉信息视图对象
...
...
@@ -19,7 +16,7 @@ public class PerformAttendAppealVo extends BaseEntityLong {
/**
* 时间
*/
private
Date
appealTimeStart
;
private
String
appealTimeStart
;
/**
* 统计类型(1.申诉次数部门排名,2.申诉次数个人排名,3.申诉次数规则排名)
*/
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java
View file @
4c5df218
...
...
@@ -167,8 +167,8 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
query
.
setCreateTimeEnd
(
DateUtil
.
today
());
}
else
{
//格式化到指定日期的当月
query
.
setCreateTimeStart
(
DateUtil
.
beginOfMonth
(
appeal
.
getAppealTimeStart
()).
toDateStr
());
query
.
setCreateTimeEnd
(
DateUtil
.
endOfMonth
(
appeal
.
getAppealTimeStart
()).
toDateStr
());
query
.
setCreateTimeStart
(
DateUtil
.
beginOfMonth
(
DateUtil
.
parse
(
appeal
.
getAppealTimeStart
()).
toJdkDate
()).
toDateStr
());
query
.
setCreateTimeEnd
(
DateUtil
.
endOfMonth
(
DateUtil
.
parse
(
appeal
.
getAppealTimeStart
()).
toJdkDate
()).
toDateStr
());
}
query
.
setGroupList
(
Arrays
.
asList
(
groupName
));
query
.
setOrderColList
(
Arrays
.
asList
(
new
OrderCol
(
"number"
,
OrderCol
.
DESCENDING
),
new
OrderCol
(
"month"
,
OrderCol
.
DESCENDING
),
new
OrderCol
(
"day"
,
OrderCol
.
DESCENDING
),
new
OrderCol
(
"createTime"
)));
...
...
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