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
ac05c629
Commit
ac05c629
authored
Jul 16, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加用户类型修改
parent
b2d2303f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
...manager-ui/admin/src/views/perform/attend/record/list.vue
+9
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java
...com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java
+1
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/InspectApiController.java
...va/com/mortals/xhx/busiz/h5/web/InspectApiController.java
+5
-0
No files found.
attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
View file @
ac05c629
...
@@ -218,11 +218,20 @@ export default {
...
@@ -218,11 +218,20 @@ export default {
{
label
:
"
异常结果
"
,
prop
:
"
errorResult
"
},
{
label
:
"
异常结果
"
,
prop
:
"
errorResult
"
},
/*
{
{
label: "图片凭证",
label: "图片凭证",
prop: "snapPath",
prop: "snapPath",
formatter: this.formatterPic,
formatter: this.formatterPic,
},
},
*/
{
label
:
"
图片凭证
"
,
prop
:
"
filePath
"
,
formatter
:
this
.
formatterPic
,
},
{
label
:
"
绩效规则
"
,
prop
:
"
ruleNme
"
},
{
label
:
"
绩效规则
"
,
prop
:
"
ruleNme
"
},
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java
View file @
ac05c629
...
@@ -214,7 +214,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
...
@@ -214,7 +214,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
recordEntity
.
setSubAddType
(
rule
.
getSubAddType
());
recordEntity
.
setSubAddType
(
rule
.
getSubAddType
());
recordEntity
.
setScore
(
rule
.
getScore
());
recordEntity
.
setScore
(
rule
.
getScore
());
recordEntity
.
setRuleId
(
rule
.
getId
());
recordEntity
.
setRuleId
(
rule
.
getId
());
recordEntity
.
setRuleNme
(
rule
.
getName
());
recordEntity
.
setRuleN
a
me
(
rule
.
getName
());
recordEntity
.
setCategoryId
(
rule
.
getCategoryId
());
recordEntity
.
setCategoryId
(
rule
.
getCategoryId
());
recordEntity
.
setCategoryName
(
rule
.
getCategoryName
());
recordEntity
.
setCategoryName
(
rule
.
getCategoryName
());
recordEntity
.
setDeductPerson
(
"admin"
);
recordEntity
.
setDeductPerson
(
"admin"
);
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/InspectApiController.java
View file @
ac05c629
...
@@ -287,6 +287,11 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
...
@@ -287,6 +287,11 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
recordEntity
.
setCategoryName
(
rule
.
getCategoryName
());
recordEntity
.
setCategoryName
(
rule
.
getCategoryName
());
recordEntity
.
setSubMethod
(
SubMethodEnum
.
大厅巡查
.
getValue
());
recordEntity
.
setSubMethod
(
SubMethodEnum
.
大厅巡查
.
getValue
());
// if(ObjectUtils.isEmpty(req.getFilePaths())){
// //recordEntity.setSna
// }
recordEntity
.
setCreateUserId
(
context
.
getUser
().
getId
());
recordEntity
.
setCreateUserId
(
context
.
getUser
().
getId
());
recordEntity
.
setCreateTime
(
new
Date
());
recordEntity
.
setCreateTime
(
new
Date
());
PerformAttendRecordEntity
save
=
attendRecordService
.
save
(
recordEntity
);
PerformAttendRecordEntity
save
=
attendRecordService
.
save
(
recordEntity
);
...
...
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