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
0452baec
Commit
0452baec
authored
Jul 19, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改考勤汇总
parent
ce4dd66b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
35 additions
and
2 deletions
+35
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceLeaveRecordVo.java
...x/module/attendance/model/vo/AttendanceLeaveRecordVo.java
+5
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
...ortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
...tals/xhx/module/check/model/vo/CheckComplainRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
...ortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
...ortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
...mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
...ortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
...als/xhx/module/check/web/CheckAttendRecordController.java
+6
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceLeaveRecordVo.java
View file @
0452baec
package
com.mortals.xhx.module.attendance.model.vo
;
package
com.mortals.xhx.module.attendance.model.vo
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity
;
import
lombok.Data
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -9,6 +11,8 @@ import java.util.List;
...
@@ -9,6 +11,8 @@ import java.util.List;
* @author zxfei
* @author zxfei
* @date 2023-04-07
* @date 2023-04-07
*/
*/
@Data
public
class
AttendanceLeaveRecordVo
extends
BaseEntityLong
{
public
class
AttendanceLeaveRecordVo
extends
BaseEntityLong
{
/** 序号,主键,自增长列表 */
private
List
<
Long
>
idList
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
View file @
0452baec
...
@@ -15,5 +15,9 @@ import java.util.Date;
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
*/
@Data
@Data
public
class
CheckAttendRecordVo
extends
BaseEntityLong
{
public
class
CheckAttendRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
View file @
0452baec
...
@@ -15,5 +15,9 @@ import java.util.Date;
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
*/
@Data
@Data
public
class
CheckComplainRecordVo
extends
BaseEntityLong
{
public
class
CheckComplainRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
View file @
0452baec
...
@@ -15,5 +15,9 @@ import java.util.Date;
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
*/
@Data
@Data
public
class
CheckEffectRecordVo
extends
BaseEntityLong
{
public
class
CheckEffectRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
View file @
0452baec
...
@@ -15,5 +15,9 @@ import java.util.Date;
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
*/
@Data
@Data
public
class
CheckGoworkRecordVo
extends
BaseEntityLong
{
public
class
CheckGoworkRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
View file @
0452baec
...
@@ -15,5 +15,9 @@ import java.util.Date;
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
*/
@Data
@Data
public
class
CheckOtherRecordVo
extends
BaseEntityLong
{
public
class
CheckOtherRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
View file @
0452baec
...
@@ -15,5 +15,9 @@ import java.util.Date;
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
*/
@Data
@Data
public
class
CheckReviewRecordVo
extends
BaseEntityLong
{
public
class
CheckReviewRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
View file @
0452baec
package
com.mortals.xhx.module.check.web
;
package
com.mortals.xhx.module.check.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
@@ -71,7 +72,6 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
...
@@ -71,7 +72,6 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
@@ -88,6 +88,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
...
@@ -88,6 +88,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
}
else
{
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDateTime
(
query
.
getCreateTime
()));
}
super
.
doListBefore
(
query
,
model
,
context
);
super
.
doListBefore
(
query
,
model
,
context
);
}
}
...
...
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