liux
/
gs_sub_evaluate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: liux:2b371d31135d964553633d3cfb83c611e39dcfd3
Branches Tags
liux:master
...
compare: liux:b33826faacfbeed4dbaae9db39a68779f58bead2
Branches Tags
liux:master

2 Commits
2b371d3113 ... b33826faac

Author SHA1 Message Date
liang.chao b33826faac Merge remote-tracking branch 'origin/master' 2025-02-19 18:24:32 +08:00
liang.chao 06336e94d9 待审核任务菜单增加红点提示 2025-02-19 18:24:28 +08:00
2 changed files with 8 additions and 18 deletions
Show Stats Expand all files Collapse all files

6
src/main/java/com/bonus/gs/sub/evaluate/manager/controller/PermissionController.java
View File

@ -84,7 +84,7 @@ public class PermissionController {
if (c.getHref().equals("pages/evaluate/outsourceAudit/outsourceAuditList.html")) { if (c.getHref().equals("pages/evaluate/outsourceAudit/outsourceAuditList.html")) {
for (OutSourceBean outSourceBean : outSourceBeans) { for (OutSourceBean outSourceBean : outSourceBeans) {
if ((Integer.parseInt(outSourceBean.getEvaluateNum())) > 0 && (Integer.parseInt(outSourceBean.getIsApprove())) == 0){ if ((Integer.parseInt(outSourceBean.getEvaluateNum())) > 0 && (Integer.parseInt(outSourceBean.getIsApprove())) == 0){
c.setIsCheckWBS(1); c.setIsCheck(1);
} }
} }
} }
@ -94,7 +94,7 @@ public class PermissionController {
Arrays.asList(loginUser.getRoleId().split(",")).contains("5")) { Arrays.asList(loginUser.getRoleId().split(",")).contains("5")) {
if ("1".equals(teamEvaluateBean.getStatus())) { if ("1".equals(teamEvaluateBean.getStatus())) {
if ("待审核".equals(teamEvaluateBean.getCheckStatus())) { if ("待审核".equals(teamEvaluateBean.getCheckStatus())) {
c.setIsCheckBZ(1); c.setIsCheck(1);
} }
} }
} }
@ -102,7 +102,7 @@ public class PermissionController {
Arrays.asList(loginUser.getRoleId().split(",")).contains("6")) { Arrays.asList(loginUser.getRoleId().split(",")).contains("6")) {
if (!"1".equals(teamEvaluateBean.getStatus())) { if (!"1".equals(teamEvaluateBean.getStatus())) {
if ("待审核".equals(teamEvaluateBean.getCheckStatus())) { if ("待审核".equals(teamEvaluateBean.getCheckStatus())) {
c.setIsCheckBZ(1); c.setIsCheck(1);
} }
} }
} }

20
src/main/java/com/bonus/gs/sub/evaluate/manager/model/Permission.java
View File

@ -14,26 +14,16 @@ public class Permission extends BaseEntity<Long> {
private String permission; private String permission;
private Integer sort; private Integer sort;
private Integer isCheckBZ; private Integer isCheck;
public Integer getIsCheckBZ() { public Integer getIsCheck() {
return isCheckBZ; return isCheck;
} }
public void setIsCheckBZ(Integer isCheckBZ) { public void setIsCheck(Integer isCheck) {
this.isCheckBZ = isCheckBZ; this.isCheck = isCheck;
} }
public Integer getIsCheckWBS() {
return isCheckWBS;
}
public void setIsCheckWBS(Integer isCheckWBS) {
this.isCheckWBS = isCheckWBS;
}
private Integer isCheckWBS;
private List<Permission> child; private List<Permission> child;
public Long getParentId() { public Long getParentId() {