chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud

This commit is contained in:
mashuanghui 2024-08-19 19:39:19 +08:00
parent db4d2b6f66 638fcafd0a
commit 47b67d96df
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java
View File

@ -95,6 +95,10 @@ public class WrkProject extends BaseEntity {
@DictFormat(dictType = "project_effect") @DictFormat(dictType = "project_effect")
@Condition(name = "project_effect", type = Condition.ConditionType.eq) @Condition(name = "project_effect", type = Condition.ConditionType.eq)
private Integer projectEffect; private Integer projectEffect;
@TableField(value = "project_effect")
@DictFormat(dictType = "project_effect")
@Condition(name = "project_effect", type = Condition.ConditionType.eq)
private Integer status;
/** /**
* 查询条件 所属部门id * 查询条件 所属部门id

2
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java
View File

@ -43,7 +43,7 @@ public class WrkAuditRuleController {
* 新增和修改 * 新增和修改
*/ */
@PostMapping ("/saveOrUpdate") @PostMapping ("/saveOrUpdate")
@RequiresPermissions("wrk:aduit:su") @RequiresPermissions("wrk:aduit:save")
@SysLog(value = "审核规则新增和修改", businessType = BusinessType.AUDIT) @SysLog(value = "审核规则新增和修改", businessType = BusinessType.AUDIT)
public AjaxResult saveOrUpdate(@Validated @RequestBody WrkAuditRuleDTO dto) { public AjaxResult saveOrUpdate(@Validated @RequestBody WrkAuditRuleDTO dto) {
return AjaxResult.success(wrkAuditRuleService.saveOrUpdate(dto)); return AjaxResult.success(wrkAuditRuleService.saveOrUpdate(dto));