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
1afd6f46
Commit
1afd6f46
authored
Mar 20, 2024
by
姬鋆屾
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.scsmile.cn/zxf/attendance-performance-platform
parents
a8c046ec
cebe28e7
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
208 additions
and
59 deletions
+208
-59
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/EffectSaveReq.java
...main/java/com/mortals/xhx/busiz/h5/req/EffectSaveReq.java
+11
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java
...com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java
+3
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/ParamKey.java
...er/src/main/java/com/mortals/xhx/common/key/ParamKey.java
+2
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java
.../perform/service/impl/PerformEffectRecordServiceImpl.java
+161
-21
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
...in/resources/sqlmap/module/check/CheckAllRecordMapper.xml
+30
-33
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
...-manager/src/test/java/com/mortals/httpclient/system.http
+1
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/EffectSaveReq.java
View file @
1afd6f46
...
...
@@ -37,4 +37,15 @@ public class EffectSaveReq extends BaseReq {
* 抓拍图片
*/
private
String
snapPath
;
/**
* 唯一标识
*/
private
String
ext
;
/**
* 名称
*/
private
String
staffName
;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java
View file @
1afd6f46
...
...
@@ -170,7 +170,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
@PostMapping
(
"effect/save"
)
@UnAuth
public
Rest
<
Void
>
effectSave
(
@RequestBody
EffectSaveReq
req
)
{
log
.
info
(
"web Api req==>{}"
,
JSON
.
toJSONString
(
req
));
log
.
info
(
"web Api req==>{}"
,
JSON
.
toJSONString
(
req
));
String
busiDesc
=
"外部效能新增"
;
Rest
rest
=
Rest
.
ok
(
busiDesc
+
"成功!"
);
try
{
...
...
@@ -405,7 +405,6 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
//效能保存
StaffEntity
staffEntity
=
getStaff
(
req
.
getPhone
());
PerformRulesEntity
rule
=
getRule
(
req
.
getRuleCode
());
checkStaffAutoConf
(
staffEntity
,
rule
);
PerformEffectRecordEntity
recordEntity
=
new
PerformEffectRecordEntity
();
recordEntity
.
initAttrValue
();
recordEntity
.
setSubMethod
(
SubMethodEnum
.
系统自动
.
getValue
());
...
...
@@ -426,6 +425,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
recordEntity
.
setDeductPerson
(
"系统管理员"
);
recordEntity
.
setDeductTime
(
new
Date
());
recordEntity
.
setWorkNum
(
staffEntity
.
getWorkNum
());
recordEntity
.
setRemark
(
req
.
getExt
());
recordEntity
.
setWindowNum
(
req
.
getWindowNum
());
...
...
@@ -506,13 +506,12 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
PerformRulesEntity
rule
=
rulesService
.
getCache
(
ruleCode
);
if
(
ObjectUtils
.
isEmpty
(
rule
))
throw
new
AppException
(
String
.
format
(
"当前手机号码未找到匹配的员工!rule:%s"
,
ruleCode
));
return
rule
;
}
private
StaffEntity
getStaff
(
String
phone
)
{
StaffEntity
staffEntity
=
staffService
.
selectOne
(
new
StaffQuery
().
phoneNumber
(
phone
));
if
(
ObjectUtils
.
isEmpty
(
staffEntity
)){
if
(
ObjectUtils
.
isEmpty
(
staffEntity
))
{
throw
new
AppException
(
String
.
format
(
"当前手机号码未找到匹配的员工!phone:%s"
,
phone
));
}
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/ParamKey.java
View file @
1afd6f46
...
...
@@ -29,4 +29,6 @@ public class ParamKey {
public
static
String
SYS_PARAM_BELONG
=
"belong"
;
public
static
String
SYS_PARAM_XNJC_URL
=
"xnjc_url"
;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java
View file @
1afd6f46
This diff is collapsed.
Click to expand it.
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
View file @
1afd6f46
This diff is collapsed.
Click to expand it.
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @
1afd6f46
...
...
@@ -86,7 +86,7 @@ Content-Type: application/json
POST {{baseUrl}}/staff/perform/summary/summary
Content-Type: application/json
{"checkTimeStart":"2024-02-01","checkTimeEnd":"2024-02-29"}
{"checkTimeStart":"2024-02-01","checkTimeEnd":"2024-02-29"
,"checkType":4
}
###考勤打卡记录异常信息列表
POST {{baseUrl}}/attendance/record/error/doReprocess
...
...
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