Commit b842f3bf authored by fangxinjiang's avatar fangxinjiang

权限批量导入

parent a3b01c4f
...@@ -6,8 +6,8 @@ spring: ...@@ -6,8 +6,8 @@ spring:
activate: activate:
on-profile: test on-profile: test
redis: redis:
host: 192.168.1.65 host: 127.0.0.1
port: 22379 port: 6379
password: '@yf_2017' password: '@yf_2017'
datasource: datasource:
insurances: insurances:
......
...@@ -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) {
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment