diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index d674678..8cc1a6a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -329,6 +329,30 @@ public class CaseApplication extends BaseEntity { */ private String userId; private List deptIds; + /** + * 部门长状态 + */ + private List deptHeadStatus; + /** + * 财务状态 + */ + private Integer financeStatus; + + public Integer getFinanceStatus() { + return financeStatus; + } + + public void setFinanceStatus(Integer financeStatus) { + this.financeStatus = financeStatus; + } + + public List getDeptHeadStatus() { + return deptHeadStatus; + } + + public void setDeptHeadStatus(List deptHeadStatus) { + this.deptHeadStatus = deptHeadStatus; + } public List getDeptIds() { return deptIds; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 000f1d8..d942e03 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -167,24 +167,28 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { throw new ServiceException("该用户没有角色权限"); } CaseApplication caseApplication = new CaseApplication(); + List caseStatusList=new ArrayList<>(); for (SysRole role : roles) { // 超级管理员和仲裁委(部门长)案件,可查看所有案件 √ if(role.getRoleName().equals("超级管理员") ){ return caseApplicationMapper.selectAdminCaseToDoCount(); } + // 查看所有案件 if(role.getRoleName().equals("仲裁委") ||role.getRoleName().equals("部门长")){ - List caseStatusList=new ArrayList<>(); caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); - return caseApplicationMapper.selectDeptHeadCaseToDoCount(caseStatusList); + caseApplication.setDeptHeadStatus(caseStatusList); } if(role.getRoleName().equals("仲裁员")){ caseApplication.setUserId(String.valueOf(userId)); } + if(role.getRoleName().equals("财务")){ + caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM); + } if(role.getRoleName().equals("法律顾问")){ // 查询角色有关的用户部门 List deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index dbe00e4..e6c0e72 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -39,12 +39,11 @@