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
215234b9
Commit
215234b9
authored
Jul 19, 2023
by
王晓旭
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.scsmile.cn/zxf/attendance-performance-platform
parents
4e98dabf
a5a6d5ae
Changes
40
Hide whitespace changes
Inline
Side-by-side
Showing
40 changed files
with
186 additions
and
35 deletions
+186
-35
attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
...e-manager-ui/admin/src/views/check/attend/record/list.vue
+7
-3
attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
...manager-ui/admin/src/views/check/complain/record/list.vue
+2
-2
attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
...e-manager-ui/admin/src/views/check/effect/record/list.vue
+3
-3
attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
...e-manager-ui/admin/src/views/check/gowork/record/list.vue
+2
-2
attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
...ce-manager-ui/admin/src/views/check/other/record/list.vue
+2
-2
attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
...e-manager-ui/admin/src/views/check/review/record/list.vue
+2
-2
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue
...manager-ui/admin/src/views/perform/attend/appeal/list.vue
+2
-2
attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
...manager-ui/admin/src/views/perform/attend/record/list.vue
+3
-3
attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue
...nager-ui/admin/src/views/perform/complain/record/list.vue
+3
-3
attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue
...manager-ui/admin/src/views/perform/effect/record/list.vue
+3
-3
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue
...manager-ui/admin/src/views/perform/gowork/record/list.vue
+3
-3
attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue
...-manager-ui/admin/src/views/perform/other/record/list.vue
+3
-3
attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue
...manager-ui/admin/src/views/perform/review/record/list.vue
+2
-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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
...s/xhx/module/check/web/CheckComplainRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
...als/xhx/module/check/web/CheckEffectRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
...als/xhx/module/check/web/CheckGoworkRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
...tals/xhx/module/check/web/CheckOtherRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
...als/xhx/module/check/web/CheckReviewRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendAppealVo.java
...ls/xhx/module/perform/model/vo/PerformAttendAppealVo.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
...ls/xhx/module/perform/model/vo/PerformAttendRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
.../xhx/module/perform/model/vo/PerformComplainRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
...ls/xhx/module/perform/model/vo/PerformEffectRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
...ls/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
...als/xhx/module/perform/model/vo/PerformOtherRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
...ls/xhx/module/perform/model/vo/PerformReviewRecordVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java
...xhx/module/perform/web/PerformAttendAppealController.java
+5
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
...xhx/module/perform/web/PerformAttendRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
...x/module/perform/web/PerformComplainRecordController.java
+18
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
...xhx/module/perform/web/PerformEffectRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
...xhx/module/perform/web/PerformGoworkRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
.../xhx/module/perform/web/PerformOtherRecordController.java
+6
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
...xhx/module/perform/web/PerformReviewRecordController.java
+7
-0
No files found.
attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
View file @
215234b9
...
...
@@ -182,8 +182,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
@@ -249,7 +249,11 @@ export default {
{
label
:
"
说明
"
,
prop
:
"
checkDesc
"
},
{
label
:
"
巡查人员
"
,
prop
:
"
createUserId
"
,
formatter
:
this
.
formatter
},
{
label
:
"
巡查人员
"
,
prop
:
"
createUserId
"
,
formatter
:
this
.
formatter
,
},
{
label
:
"
核查人员
"
,
prop
:
"
checkPerson
"
},
...
...
attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
View file @
215234b9
...
...
@@ -189,8 +189,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
View file @
215234b9
...
...
@@ -183,9 +183,9 @@ export default {
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
label
:
"
请选择日期
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择
开始
日期
"
,
fuzzy
:
false
,
},
{
...
...
attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
View file @
215234b9
...
...
@@ -183,8 +183,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
View file @
215234b9
...
...
@@ -182,8 +182,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
View file @
215234b9
...
...
@@ -188,8 +188,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue
View file @
215234b9
...
...
@@ -92,7 +92,7 @@ export default {
},
methods
:
{
handleCellClick
(
row
,
column
,
event
,
cell
)
{
if
(
(
column
.
label
==
"
图片凭证
"
)
)
{
if
(
column
.
label
==
"
图片凭证
"
)
{
const
suffix
=
`(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`
;
const
regular
=
new
RegExp
(
`.*\.
${
suffix
}
`
);
regular
.
test
(
row
.
filePaths
);
...
...
@@ -197,7 +197,7 @@ export default {
},
{
name
:
"
date
"
,
type
:
"
date
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
View file @
215234b9
...
...
@@ -82,7 +82,7 @@ export default {
created
()
{},
methods
:
{
handleCellClick
(
row
,
column
,
event
,
cell
)
{
if
(
(
column
.
label
==
"
图片凭证
"
)
)
{
if
(
column
.
label
==
"
图片凭证
"
)
{
const
suffix
=
`(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`
;
const
regular
=
new
RegExp
(
`.*\.
${
suffix
}
`
);
regular
.
test
(
row
.
filePaths
);
...
...
@@ -190,8 +190,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue
View file @
215234b9
...
...
@@ -82,7 +82,7 @@ export default {
created
()
{},
methods
:
{
handleCellClick
(
row
,
column
,
event
,
cell
)
{
if
(
(
column
.
label
==
"
图片凭证
"
)
)
{
if
(
column
.
label
==
"
图片凭证
"
)
{
const
suffix
=
`(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`
;
const
regular
=
new
RegExp
(
`.*\.
${
suffix
}
`
);
regular
.
test
(
row
.
filePaths
);
...
...
@@ -196,8 +196,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue
View file @
215234b9
...
...
@@ -82,7 +82,7 @@ export default {
created
()
{},
methods
:
{
handleCellClick
(
row
,
column
,
event
,
cell
)
{
if
(
(
column
.
label
==
"
图片凭证
"
)
)
{
if
(
column
.
label
==
"
图片凭证
"
)
{
const
suffix
=
`(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`
;
const
regular
=
new
RegExp
(
`.*\.
${
suffix
}
`
);
regular
.
test
(
row
.
filePaths
);
...
...
@@ -191,8 +191,8 @@ export default {
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue
View file @
215234b9
...
...
@@ -82,7 +82,7 @@ export default {
created
()
{},
methods
:
{
handleCellClick
(
row
,
column
,
event
,
cell
)
{
if
(
(
column
.
label
==
"
图片凭证
"
)
)
{
if
(
column
.
label
==
"
图片凭证
"
)
{
const
suffix
=
`(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`
;
const
regular
=
new
RegExp
(
`.*\.
${
suffix
}
`
);
regular
.
test
(
row
.
filePaths
);
...
...
@@ -190,8 +190,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue
View file @
215234b9
...
...
@@ -82,7 +82,7 @@ export default {
created
()
{},
methods
:
{
handleCellClick
(
row
,
column
,
event
,
cell
)
{
if
(
(
column
.
label
==
"
图片凭证
"
)
)
{
if
(
column
.
label
==
"
图片凭证
"
)
{
const
suffix
=
`(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`
;
const
regular
=
new
RegExp
(
`.*\.
${
suffix
}
`
);
regular
.
test
(
row
.
filePaths
);
...
...
@@ -190,8 +190,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue
View file @
215234b9
...
...
@@ -196,8 +196,8 @@ export default {
fuzzy
:
false
,
},
{
name
:
"
dat
e
"
,
type
:
"
date
"
,
name
:
"
createTim
e
"
,
type
:
"
date
time
"
,
label
:
"
请选择日期
"
,
fuzzy
:
false
,
},
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceLeaveRecordVo.java
View file @
215234b9
package
com.mortals.xhx.module.attendance.model.vo
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity
;
import
lombok.Data
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
...
...
@@ -9,6 +11,8 @@ import java.util.List;
* @author zxfei
* @date 2023-04-07
*/
@Data
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 @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
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 @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
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 @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
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 @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
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 @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
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 @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
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 @
215234b9
package
com.mortals.xhx.module.check.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -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
())));
Map
<
String
,
String
>
collect
=
userService
.
find
(
new
UserQuery
(),
getContext
()).
stream
()
.
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
));
...
...
@@ -88,6 +88,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
super
.
doListBefore
(
query
,
model
,
context
);
}
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.check.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -80,6 +81,11 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
/**
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.check.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -91,6 +92,11 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
/**
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.check.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -79,6 +80,11 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
/**
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.check.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -79,6 +80,11 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
/**
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.check.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -92,6 +93,11 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
/**
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendAppealVo.java
View file @
215234b9
...
...
@@ -26,4 +26,10 @@ public class PerformAttendAppealVo extends BaseEntityLong {
private
String
performTypeStr
;
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
View file @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public
class
PerformAttendRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
View file @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public
class
PerformComplainRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
View file @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public
class
PerformEffectRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
View file @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public
class
PerformGoworkRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
View file @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public
class
PerformOtherRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
View file @
215234b9
...
...
@@ -15,5 +15,9 @@ import java.util.Date;
*/
@Data
public
class
PerformReviewRecordVo
extends
BaseEntityLong
{
/** 开始 创建时间 */
private
String
createTimeStart
;
/** 结束 创建时间 */
private
String
createTimeEnd
;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java
View file @
215234b9
package
com.mortals.xhx.module.perform.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
...
...
@@ -95,6 +96,10 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
/**
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.perform.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -77,5 +78,10 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.perform.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
...
...
@@ -8,12 +11,14 @@ import com.mortals.xhx.common.code.*;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.mortals.framework.model.Context
;
import
com.mortals.xhx.module.perform.model.PerformComplainRecordEntity
;
import
com.mortals.xhx.module.perform.service.PerformComplainRecordService
;
import
java.util.Arrays
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
...
...
@@ -58,5 +63,18 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
super
.
init
(
model
,
context
);
}
@Override
protected
void
doListBefore
(
PerformComplainRecordEntity
query
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
if
(
ObjectUtils
.
isEmpty
(
query
.
getOrderColList
()))
{
query
.
setOrderColList
(
Arrays
.
asList
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
)));
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.perform.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -76,5 +77,10 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.perform.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -76,5 +77,10 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.perform.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -77,5 +78,10 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
View file @
215234b9
package
com.mortals.xhx.module.perform.web
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
...
@@ -79,5 +80,11 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"createTime"
,
OrderCol
.
DESCENDING
));
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getCreateTime
())){
query
.
setCreateTimeStart
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
query
.
setCreateTimeEnd
(
DateUtil
.
formatDate
(
query
.
getCreateTime
()));
}
}
}
\ No newline at end of file
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