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
a1012d86
Commit
a1012d86
authored
Sep 04, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改统计查询结果
parent
b258a9f2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
15 deletions
+27
-15
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
...-manager/src/test/java/com/mortals/httpclient/system.http
+13
-0
db/add.sql
db/add.sql
+14
-15
No files found.
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @
a1012d86
...
...
@@ -179,3 +179,16 @@ Authorization: {{authToken}}
Content-Type: application/json
{"alarmTime":1714285745000,"attendanceGroupName":"","duration":3000,"fileNames":"image.jpg","filePaths":"file/fileupload/1715236144379.jpg","happenTime":1715149753000,"irregularType":3,"performType":"effect","ruleId":25,"staffId":774,"windowNum":""}
###考勤汇总
POST {{baseUrl}}/attendance/stat/listExt
Content-Type: application/json
{
"summaryTimeStart": "2024-08-01",
"summaryTimeEnd": "2024-08-30",
"summaryTypeList": ["正常","假","迟到","早退","缺卡"]
}
\ No newline at end of file
db/add.sql
View file @
a1012d86
...
...
@@ -2,7 +2,7 @@ ALTER TABLE mortals_xhx_staff ADD COLUMN `score` decimal(10,2) default 0.00
ALTER
TABLE
mortals_xhx_dept
ADD
COLUMN
`score`
decimal
(
10
,
2
)
default
0
.
00
COMMENT
'绩效分数'
AFTER
updateTime
;
-- ----------------------------
2023
-
7
-
05
--
2023-7-05
-- ----------------------------
-- ----------------------------
...
...
@@ -282,7 +282,7 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管
-- ----------------------------
2023
-
7
-
08
--
2023-7-08
-- ----------------------------
ALTER
TABLE
mortals_xhx_user
ADD
COLUMN
`customerId`
bigint
(
20
)
DEFAULT
-
1
COMMENT
'员工id'
AFTER
status
;
...
...
@@ -332,7 +332,7 @@ ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `filePaths` varchar(256)
-- ----------------------------
2023
-
7
-
09
--
2023-7-09
-- ----------------------------
ALTER
TABLE
mortals_xhx_feedback
ADD
COLUMN
`ruleContent`
varchar
(
1024
)
DEFAULT
''
COMMENT
'规则内容'
AFTER
formContent
;
...
...
@@ -381,7 +381,7 @@ ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `categoryName` varchar(128
ALTER
TABLE
mortals_xhx_perform_rules
ADD
COLUMN
`ruleCode`
varchar
(
64
)
COMMENT
'规则编码,唯一,默认规则类型内容简称拼音首字母。'
AFTER
id
;
-- ----------------------------
2023
-
7
-
10
--
2023-7-10
-- ----------------------------
ALTER
TABLE
mortals_xhx_perform_review_record
ADD
COLUMN
`subAddType`
tinyint
(
1
)
DEFAULT
'1'
COMMENT
'增减类型(1.增加,2.扣除)'
AFTER
deductTime
;
...
...
@@ -406,7 +406,7 @@ ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `subAddType` tinyint(1)
-- ----------------------------
2023
-
7
-
10
2
--
2023-7-10 2
-- ----------------------------
...
...
@@ -542,7 +542,7 @@ PRIMARY KEY (`id`)
-- ----------------------------
2023
-
7
-
14
--
2023-7-14
-- ----------------------------
-- ----------------------------
...
...
@@ -643,7 +643,7 @@ PRIMARY KEY (`id`)
-- ----------------------------
2023
-
7
-
15
--
2023-7-15
-- ----------------------------
...
...
@@ -697,7 +697,7 @@ ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `windowNum` varchar(64)
-- ----------------------------
2023
-
7
-
16
--
2023-7-16
-- ----------------------------
-- ----------------------------
-- 员工入职信息菜单 SQL
...
...
@@ -726,7 +726,7 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '员工状态', 'StaffOnboard', 'o
-- ----------------------------
2023
-
7
-
17
--
2023-7-17
-- ----------------------------
-- ----------------------------
-- 请假记录信息表
...
...
@@ -1251,7 +1251,7 @@ ALTER TABLE `mortals_xhx_staff_perform_summary`
-- ----------------------------
2024
-
03
-
18
--
2024-03-18
-- ----------------------------
-- ----------------------------
-- 门禁设备表
...
...
@@ -1277,7 +1277,7 @@ PRIMARY KEY (`id`)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'门禁设备'
;
-- ----------------------------
2024
-
04
-
26
--
2024-04-26
-- ----------------------------
-- ----------------------------
-- 窗口负责人
...
...
@@ -1286,7 +1286,7 @@ ALTER TABLE `mortals_xhx_window_owner` ADD COLUMN `roleType` tinyint(2) COMMENT
ADD
COLUMN
`inspect`
tinyint
(
2
)
DEFAULT
'0'
COMMENT
'是否允许巡检'
AFTER
`roleType`
,
ADD
COLUMN
`staffIds`
varchar
(
255
)
COMMENT
'管辖人员'
AFTER
`inspect`
;
-- ----------------------------
2024
-
04
-
28
--
2024-04-28
-- ----------------------------
-- ----------------------------
-- 绩效异常信息表
...
...
@@ -1329,18 +1329,17 @@ ADD COLUMN `processPerson` varchar(128) COMMENT '处理人员' AFTER `proce
ADD
KEY
`appealPerson`
(
`appealPerson`
)
USING
BTREE
;
-- ----------------------------
2024
-
07
-
08
--
2024-07-08
-- ----------------------------
INSERT
INTO
`mortals_xhx_perform_rules`
(
`ruleCode`
,
`categoryId`
,
`categoryName`
,
`name`
,
`content`
,
`subAddType`
,
`score`
,
`assoOwner`
,
`ownerScore`
,
`remark`
,
`type`
,
`createUserId`
,
`createTime`
,
`updateUserId`
,
`updateTime`
)
VALUES
(
'ATTEND1010'
,
'1'
,
''
,
'事假半天'
,
'事假半天'
,
'2'
,
'0.5'
,
'0'
,
'0.00'
,
''
,
'1'
,
'1'
,
NOW
(),
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_perform_rules`
(
`ruleCode`
,
`categoryId`
,
`categoryName`
,
`name`
,
`content`
,
`subAddType`
,
`score`
,
`assoOwner`
,
`ownerScore`
,
`remark`
,
`type`
,
`createUserId`
,
`createTime`
,
`updateUserId`
,
`updateTime`
)
VALUES
(
'ATTEND1011'
,
'1'
,
''
,
'事假全天'
,
'事假全天'
,
'2'
,
'1'
,
'0'
,
'0.00'
,
''
,
'1'
,
'1'
,
NOW
(),
NULL
,
NULL
);
-- ----------------------------
2024
-
07
-
22
--
2024-07-22
-- ----------------------------
ALTER
TABLE
`mortals_xhx_staff_perform_summary`
ADD
COLUMN
`remarkAdd`
VARCHAR
(
2048
)
DEFAULT
NULL
COMMENT
'加分备注'
AFTER
`month`
,
ADD
COLUMN
`addTotalScore`
DECIMAL
(
10
,
2
)
DEFAULT
NULL
COMMENT
'加分合计'
AFTER
`remarkAdd`
,
ADD
COLUMN
`sumScore`
DECIMAL
(
10
,
2
)
DEFAULT
NULL
COMMENT
'合计得分'
AFTER
`addTotalScore`
;
UPDATE
`mortals_xhx_staff_perform_summary`
SET
sumScore
=
totalScore
,
addTotalScore
=
0
;
\ 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