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
ac93781b
Commit
ac93781b
authored
Jul 15, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加照片海康下载
parent
2e1f8cf0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java
...va/com/mortals/xhx/busiz/h5/web/PerformApiController.java
+3
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
...rtals/xhx/module/staff/service/impl/StaffServiceImpl.java
+9
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java
View file @
ac93781b
...
...
@@ -5,6 +5,7 @@ import java.math.BigDecimal;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.RandomUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
...
...
@@ -377,7 +378,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
if
(
PerformTypeEnum
.
考勤绩效
.
getValue
().
equals
(
performReq
.
getPerformType
()))
{
CheckAttendRecordEntity
checkEntity
=
checkAttendRecordService
.
get
(
performReq
.
getId
(),
context
);
BeanUtils
.
copyProperties
(
checkEntity
,
performDetailInfo
,
BeanUtil
.
getNullPropertyNames
(
checkEntity
));
}
else
if
(
PerformTypeEnum
.
评价差评绩效
.
getValue
().
equals
(
performReq
.
getPerformType
()))
{
CheckReviewRecordEntity
checkEntity
=
checkReviewRecordService
.
get
(
performReq
.
getId
(),
context
);
BeanUtils
.
copyProperties
(
checkEntity
,
performDetailInfo
,
BeanUtil
.
getNullPropertyNames
(
checkEntity
));
...
...
@@ -413,6 +413,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
}
rest
.
setData
(
performDetailInfo
);
log
.
info
(
"rspperformDetailInfo:{}"
,
JSON
.
toJSONString
(
performDetailInfo
));
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
e
)
{
log
.
error
(
busiDesc
,
e
);
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
View file @
ac93781b
...
...
@@ -50,6 +50,14 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
// return "1000"+data.getWorkNum();
}
@Override
protected
void
saveBefore
(
StaffEntity
entity
,
Context
context
)
throws
AppException
{
int
count
=
this
.
count
(
new
StaffQuery
().
workNum
(
entity
.
getWorkNum
()),
context
);
if
(
count
>
0
){
throw
new
AppException
(
"工号重复!"
);
}
}
@Override
public
StaffInfoVo
queryAll
()
{
StaffInfoVo
staffInfoVo
=
new
StaffInfoVo
();
...
...
@@ -103,6 +111,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
userEntity
.
setUserType
(
UserType
.
WORK_PERSON
.
getValue
());
userEntity
.
setSiteIds
(
"1"
);
userEntity
.
setAreaCodes
(
"511500000000"
);
userEntity
.
setMobile
(
entity
.
getPhoneNumber
());
userEntity
.
setStatus
(
UserStatus
.
NORMAL
.
getValue
());
userEntity
.
setCreateUserId
(
this
.
getContextUserId
(
context
));
userEntity
.
setCreateTime
(
new
Date
());
...
...
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