Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
0414ac3b
Commit
0414ac3b
authored
Aug 23, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交加拦截
parent
226f6f3f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
16 deletions
+27
-16
TSalaryStandardController.java
.../v1/yifu/salary/controller/TSalaryStandardController.java
+26
-16
SalaryConstants.java
.../yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java
+1
-0
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @
0414ac3b
...
@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
...
@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService
;
import
com.yifu.cloud.plus.v1.yifu.salary.util.SalaryConstants
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
...
@@ -159,6 +160,12 @@ public class TSalaryStandardController {
...
@@ -159,6 +160,12 @@ public class TSalaryStandardController {
@PostMapping
(
"/doSubmit"
)
@PostMapping
(
"/doSubmit"
)
public
R
salaryStandardAudit
(
@RequestBody
TSalaryStandard
tSalaryStandard
)
{
public
R
salaryStandardAudit
(
@RequestBody
TSalaryStandard
tSalaryStandard
)
{
if
(
tSalaryStandard
!=
null
&&
Common
.
isNotNull
(
tSalaryStandard
.
getId
()))
{
if
(
tSalaryStandard
!=
null
&&
Common
.
isNotNull
(
tSalaryStandard
.
getId
()))
{
TSalaryStandard
s
=
tSalaryStandardService
.
getById
(
tSalaryStandard
.
getId
());
if
(
s
==
null
)
{
return
R
.
failed
(
"未找到工资表"
);
}
else
if
(
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
0
]
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
5
]
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
7
])
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
!=
null
)
{
if
(
user
!=
null
)
{
TApprovalRecord
tApprovalRecord
=
new
TApprovalRecord
();
TApprovalRecord
tApprovalRecord
=
new
TApprovalRecord
();
...
@@ -177,6 +184,9 @@ public class TSalaryStandardController {
...
@@ -177,6 +184,9 @@ public class TSalaryStandardController {
}
else
{
}
else
{
return
R
.
failed
(
"请登录!"
);
return
R
.
failed
(
"请登录!"
);
}
}
}
else
{
return
R
.
failed
(
"请刷新后检查薪资表状态!"
);
}
}
else
{
}
else
{
return
R
.
failed
(
"请传参!"
);
return
R
.
failed
(
"请传参!"
);
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java
View file @
0414ac3b
...
@@ -33,6 +33,7 @@ public class SalaryConstants {
...
@@ -33,6 +33,7 @@ public class SalaryConstants {
* @return:
* @return:
**/
**/
public
static
final
Integer
[]
AUDIT_STATUS
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
};
public
static
final
Integer
[]
AUDIT_STATUS
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
};
public
static
final
int
[]
STATUS
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
};
public
static
final
String
[]
AUDIT_STATUS_STRING
=
{
"待提交"
,
"待审核"
,
"-"
,
"待发放"
,
"已发放"
,
"审核不通过"
,
"确认不通过"
,
"财务退回"
,
"结算单调整待审核"
,
"结算单调整待打印"
};
public
static
final
String
[]
AUDIT_STATUS_STRING
=
{
"待提交"
,
"待审核"
,
"-"
,
"待发放"
,
"已发放"
,
"审核不通过"
,
"确认不通过"
,
"财务退回"
,
"结算单调整待审核"
,
"结算单调整待打印"
};
//发放失败-认领状态 0待认领1待出账2已发放3再次失败待认领
//发放失败-认领状态 0待认领1待出账2已发放3再次失败待认领
public
static
final
Integer
[]
LOST_STATUS
=
{
0
,
1
,
2
,
3
};
public
static
final
Integer
[]
LOST_STATUS
=
{
0
,
1
,
2
,
3
};
...
...
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