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
4f83af74
Commit
4f83af74
authored
Jul 31, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改固定班次考勤
parent
2d246048
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
113 additions
and
5 deletions
+113
-5
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendAppealEntity.java
...s/xhx/module/perform/model/PerformAttendAppealEntity.java
+5
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendAppealQuery.java
...ls/xhx/module/perform/model/PerformAttendAppealQuery.java
+57
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendAppealVo.java
...ls/xhx/module/perform/model/vo/PerformAttendAppealVo.java
+2
-0
attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendAppealMapper.xml
...urces/sqlmap/module/perform/PerformAttendAppealMapper.xml
+44
-4
db/add.sql
db/add.sql
+5
-0
doc/考勤绩效管理系统.docx
doc/考勤绩效管理系统.docx
+0
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendAppealEntity.java
View file @
4f83af74
...
...
@@ -244,6 +244,11 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
* 扣分时间
*/
private
Date
deductTime
;
/**
* 窗口编号
*/
private
String
windowNum
;
/**
* 绩效记录申诉附件信息信息
*/
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendAppealQuery.java
View file @
4f83af74
...
...
@@ -9,7 +9,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
* 绩效记录申诉信息查询对象
*
* @author zxfei
* @date 2023-07-
15
* @date 2023-07-
31
*/
public
class
PerformAttendAppealQuery
extends
PerformAttendAppealEntity
{
/** 开始 序号,主键,自增长 */
...
...
@@ -480,6 +480,11 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
/** 结束 扣分时间 */
private
String
deductTimeEnd
;
/** 窗口编号 */
private
List
<
String
>
windowNumList
;
/** 窗口编号排除列表 */
private
List
<
String
>
windowNumNotList
;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private
List
<
PerformAttendAppealQuery
>
orConditionList
;
...
...
@@ -3145,6 +3150,38 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
this
.
deductTimeEnd
=
deductTimeEnd
;
}
/**
* 获取 窗口编号
* @return windowNumList
*/
public
List
<
String
>
getWindowNumList
(){
return
this
.
windowNumList
;
}
/**
* 设置 窗口编号
* @param windowNumList
*/
public
void
setWindowNumList
(
List
<
String
>
windowNumList
){
this
.
windowNumList
=
windowNumList
;
}
/**
* 获取 窗口编号
* @return windowNumNotList
*/
public
List
<
String
>
getWindowNumNotList
(){
return
this
.
windowNumNotList
;
}
/**
* 设置 窗口编号
* @param windowNumNotList
*/
public
void
setWindowNumNotList
(
List
<
String
>
windowNumNotList
){
this
.
windowNumNotList
=
windowNumNotList
;
}
/**
* 设置 序号,主键,自增长
* @param id
...
...
@@ -4589,6 +4626,25 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
}
/**
* 设置 窗口编号
* @param windowNum
*/
public
PerformAttendAppealQuery
windowNum
(
String
windowNum
){
setWindowNum
(
windowNum
);
return
this
;
}
/**
* 设置 窗口编号
* @param windowNumList
*/
public
PerformAttendAppealQuery
windowNumList
(
List
<
String
>
windowNumList
){
this
.
windowNumList
=
windowNumList
;
return
this
;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendAppealVo.java
View file @
4f83af74
...
...
@@ -32,4 +32,6 @@ public class PerformAttendAppealVo extends BaseEntityLong {
/** 结束 创建时间 */
private
String
createTimeEnd
;
private
String
windowNum
;
}
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendAppealMapper.xml
View file @
4f83af74
This diff is collapsed.
Click to expand it.
db/add.sql
View file @
4f83af74
...
...
@@ -816,3 +816,8 @@ ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `auditStatus` tinyint(
ALTER
TABLE
mortals_xhx_check_gowork_record
ADD
COLUMN
`auditStatus`
tinyint
(
1
)
DEFAULT
'1'
COMMENT
'审核状态(1.同意,2.不同意)'
;
ALTER
TABLE
mortals_xhx_check_effect_record
ADD
COLUMN
`auditStatus`
tinyint
(
1
)
DEFAULT
'1'
COMMENT
'审核状态(1.同意,2.不同意)'
;
ALTER
TABLE
mortals_xhx_check_other_record
ADD
COLUMN
`auditStatus`
tinyint
(
1
)
DEFAULT
'1'
COMMENT
'审核状态(1.同意,2.不同意)'
;
ALTER
TABLE
mortals_xhx_perform_attend_appeal
ADD
COLUMN
`windowNum`
varchar
(
255
)
DEFAULT
''
COMMENT
'窗口编号'
;
doc/考勤绩效管理系统.docx
View file @
4f83af74
No preview for this file type
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