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
b842f3bf
Commit
b842f3bf
authored
Jan 23, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限批量导入
parent
a3b01c4f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
application-test.yml
...fu-insurances-biz/src/main/resources/application-test.yml
+2
-2
TSalaryStandardController.java
.../v1/yifu/salary/controller/TSalaryStandardController.java
+5
-0
application-dev.yml
...ry/yifu-salary-biz/src/main/resources/application-dev.yml
+1
-0
No files found.
yifu-insurances/yifu-insurances-biz/src/main/resources/application-test.yml
View file @
b842f3bf
...
@@ -6,8 +6,8 @@ spring:
...
@@ -6,8 +6,8 @@ spring:
activate
:
activate
:
on-profile
:
test
on-profile
:
test
redis
:
redis
:
host
:
1
92.168.1.65
host
:
1
27.0.0.1
port
:
22
379
port
:
6
379
password
:
'
@yf_2017'
password
:
'
@yf_2017'
datasource
:
datasource
:
insurances
:
insurances
:
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @
b842f3bf
...
@@ -137,6 +137,7 @@ public class TSalaryStandardController {
...
@@ -137,6 +137,7 @@ public class TSalaryStandardController {
* @author fxj
* @author fxj
* @date 2022-08-05 11:40:14
* @date 2022-08-05 11:40:14
**/
**/
@SysLog
(
"薪资-导出标准薪酬工资表"
)
@Operation
(
description
=
"导出标准薪酬工资表 hasPermission('salary_tsalarystandard-export')"
)
@Operation
(
description
=
"导出标准薪酬工资表 hasPermission('salary_tsalarystandard-export')"
)
@PostMapping
(
"/export"
)
@PostMapping
(
"/export"
)
//@PreAuthorize("@pms.hasPermission('salary_tsalarystandard-export')")
//@PreAuthorize("@pms.hasPermission('salary_tsalarystandard-export')")
...
@@ -169,6 +170,7 @@ public class TSalaryStandardController {
...
@@ -169,6 +170,7 @@ public class TSalaryStandardController {
* @param id
* @param id
* @return
* @return
*/
*/
@SysLog
(
"薪资-薪酬审核"
)
@Operation
(
description
=
"薪酬审核"
)
@Operation
(
description
=
"薪酬审核"
)
@PostMapping
(
"/salaryStandardAudit"
)
@PostMapping
(
"/salaryStandardAudit"
)
public
R
<
String
>
salaryStandardAudit
(
@RequestParam
String
auditFlag
,
@RequestParam
(
required
=
false
)
String
auditRemark
,
public
R
<
String
>
salaryStandardAudit
(
@RequestParam
String
auditFlag
,
@RequestParam
(
required
=
false
)
String
auditRemark
,
...
@@ -180,6 +182,7 @@ public class TSalaryStandardController {
...
@@ -180,6 +182,7 @@ public class TSalaryStandardController {
* 保存并提交
* 保存并提交
* @return
* @return
*/
*/
@SysLog
(
"薪资保存并提交"
)
@Operation
(
description
=
"保存并提交"
)
@Operation
(
description
=
"保存并提交"
)
@PostMapping
(
"/doSubmit"
)
@PostMapping
(
"/doSubmit"
)
public
R
<
String
>
salaryStandardAudit
(
@RequestBody
TSalaryStandard
tSalaryStandard
)
{
public
R
<
String
>
salaryStandardAudit
(
@RequestBody
TSalaryStandard
tSalaryStandard
)
{
...
@@ -222,6 +225,7 @@ public class TSalaryStandardController {
...
@@ -222,6 +225,7 @@ public class TSalaryStandardController {
* @Date: 2022/8/26 11:40
* @Date: 2022/8/26 11:40
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R
**/
**/
@SysLog
(
"薪资-发送至EKP"
)
@Operation
(
description
=
"发送至EKP"
)
@Operation
(
description
=
"发送至EKP"
)
@PostMapping
(
"/doSend"
)
@PostMapping
(
"/doSend"
)
public
R
<
String
>
doSend
(
@RequestParam
String
id
)
{
public
R
<
String
>
doSend
(
@RequestParam
String
id
)
{
...
@@ -244,6 +248,7 @@ public class TSalaryStandardController {
...
@@ -244,6 +248,7 @@ public class TSalaryStandardController {
* @param id
* @param id
* @return
* @return
*/
*/
@SysLog
(
"薪资-重新生成收入"
)
@Operation
(
description
=
"重新生成收入"
)
@Operation
(
description
=
"重新生成收入"
)
@GetMapping
(
"/salaryDoIncome"
)
@GetMapping
(
"/salaryDoIncome"
)
public
R
<
String
>
salaryDoIncome
(
@RequestParam
String
id
)
{
public
R
<
String
>
salaryDoIncome
(
@RequestParam
String
id
)
{
...
...
yifu-salary/yifu-salary-biz/src/main/resources/application-dev.yml
View file @
b842f3bf
...
@@ -8,6 +8,7 @@ spring:
...
@@ -8,6 +8,7 @@ spring:
redis
:
redis
:
host
:
127.0.0.1
host
:
127.0.0.1
port
:
6379
port
:
6379
password
:
'
@yf_2017'
datasource
:
datasource
:
type
:
com.zaxxer.hikari.HikariDataSource
type
:
com.zaxxer.hikari.HikariDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
...
...
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