From 088bd41d0b77f1c8e8b16b6e81d0cee2c0d7fb84 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Tue, 9 Jan 2024 11:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F=E9=80=81?= =?UTF-8?q?=E8=BE=BE=E8=A3=81=E5=86=B3=E4=B9=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdjudicationController.java | 2 +- .../mapper/CaseApplicationMapper.java | 2 + .../service/impl/AdjudicationServiceImpl.java | 5 +- .../impl/CaseApplicationServiceImpl.java | 98 ++++++++++++++-- .../wisdomarbitrate/CaseApplicationMapper.xml | 107 ++++++++++++++++++ 5 files changed, 204 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java index da230f3..781d79e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java @@ -200,7 +200,7 @@ public class AdjudicationController extends BaseController { * @return */ @PostMapping("/serviceBatch") - public AjaxResult serviceBatch( CaseApplication caseApplication){ + public AjaxResult serviceBatch(@Validated @RequestBody CaseApplication caseApplication){ if(StrUtil.isEmpty(caseApplication.getBatchNumber().toString())){ return error("参数校验失败"); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java index 3145ff4..0ecd151 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java @@ -137,4 +137,6 @@ public interface CaseApplicationMapper { List selectAdminCaseApplicationListBatch(CaseApplication caseApplication); List listCaseApplicationByBatchNumber(CaseApplication caseApplication); + + List selectAdminCaseApplicationListBatch1(CaseApplication caseApplication); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 3afe6b9..09c3c33 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -610,7 +610,10 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } //修改案件状态 caseApplicationById.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION); - caseApplicationById.setLockStatus(1); + Integer arbitratMethod = caseApplicationById.getArbitratMethod(); + if(arbitratMethod==1){ + caseApplicationById.setLockStatus(1); + } caseApplicationMapper.submitCaseApplication(caseApplicationById); } 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 7771695..556fb5f 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 @@ -2561,7 +2561,89 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override public List selectCaseApplicationListBatchByRole(CaseApplication caseApplication) { - List caseApplicationlist = caseApplicationMapper.selectAdminCaseApplicationListBatch(caseApplication); + // 获取登录用户 + LoginUser loginUser = getLoginUser(); + SysUser user = loginUser.getUser(); + Long userId = user.getUserId(); + SysUser sysUser = sysUserMapper.selectUserById(userId); + List roles = sysUser.getRoles(); + // 没有角色不能查看案件列表 + if (CollectionUtil.isEmpty(roles)) { + throw new ServiceException("该用户没有角色权限"); + } + for (SysRole role : roles) { + if (StrUtil.isEmpty(role.getRoleName())) { + continue; + } + if ("超级管理员".equals(role.getRoleName())) { + List caseApplicationlist = caseApplicationMapper.selectAdminCaseApplicationListBatch(caseApplication); + if(caseApplicationlist!=null&&caseApplicationlist.size()>0){ + for(CaseApplication caseApplicationselect : caseApplicationlist){ + Integer batchNumber = caseApplicationselect.getBatchNumber(); + CaseApplication caseApplicationsel = new CaseApplication(); + caseApplicationsel.setBatchNumber(batchNumber); + List caseApplications = caseApplicationMapper.listCaseApplicationByBatchNumber(caseApplicationsel); + if (caseApplications != null && caseApplications.size() > 0) { + List caseStatuss = caseApplications.stream().map(CaseApplication::getCaseStatus).collect(Collectors.toList()); + List caseStatusNames = caseApplications.stream().map(CaseApplication::getCaseStatusName).collect(Collectors.toList()); + List caseStatussnew = caseStatuss.stream().distinct().collect(Collectors.toList()); + List caseStatusNamesnew = caseStatusNames.stream().distinct().collect(Collectors.toList()); + String caseStatusName = caseStatusNamesnew.stream().map(Object::toString).collect(Collectors.joining(",")); + String caseStatusstr = caseStatussnew.stream().map(Object::toString).collect(Collectors.joining(",")); + caseApplicationselect.setCaseStatusName(caseStatusName); + caseApplicationselect.setCaseStatusstr(caseStatusstr); + } + } + } + return caseApplicationlist; + + } + + if ("仲裁委".equals(role.getRoleName()) + || "部门长".equals(role.getRoleName())) { + List caseStatusList = new ArrayList<>(); + caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); + caseStatusList.add(CaseApplicationConstants.CHECK_ARBITRATION); + // caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); + caseApplication.setDeptHeadStatus(caseStatusList); + caseApplication.setIsOtherRole(1); + } + if ("仲裁员".equals(role.getRoleName())) { + caseApplication.setUserId(String.valueOf(userId)); + caseApplication.setIsOtherRole(1); + } + if ("财务".equals(role.getRoleName())) { + caseApplication.setIsOtherRole(1); + caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM); + } + if ("法律顾问".equals(role.getRoleName())) { + // 秘书查看所有案件 + // 查询角色有关的用户部门 + List deptIds = new ArrayList<>(); + deptIds.add(sysUser.getDeptId()); + caseApplication.setDeptIds(deptIds); + } + if ("申请人".equals(role.getRoleName())) { + // caseApplication.setIsOtherRole(1); + // 查询有关的用户部门 + caseApplication.setApplicationOrganId(String.valueOf(sysUser.getDeptId())); + } + if ("被申请人".equals(role.getRoleName())) { + caseApplication.setIsOtherRole(1); + // + caseApplication.setIdCard(String.valueOf(sysUser.getIdCard())); + } + if ("代理人".equals(role.getRoleName())) { + caseApplication.setIsOtherRole(1); + // 查询角色有关的用户部门 + // List agentDeptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); + List agentDeptIds = new ArrayList<>(); + agentDeptIds.add(sysUser.getDeptId()); + caseApplication.setAgentDeptIds(agentDeptIds); + } + + } + List caseApplicationlist = caseApplicationMapper.selectAdminCaseApplicationListBatch1(caseApplication); if(caseApplicationlist!=null&&caseApplicationlist.size()>0){ for(CaseApplication caseApplicationselect : caseApplicationlist){ Integer batchNumber = caseApplicationselect.getBatchNumber(); @@ -2895,18 +2977,18 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION, ""); } else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核 ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord(); - ArbitrateRecord arbitrateRecordnew = caseApplicationse.getArbitrateRecord(); + + ArbitrateRecord arbitrateRecordsel = new ArbitrateRecord(); + arbitrateRecordsel.setCaseAppliId(caseApplicationse.getId()); + ArbitrateRecord arbitrateRecordnew = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecordsel); if(arbitrateRecordnew!=null){ arbitrateRecordnew.setCheckOpinion(arbitrateRecord.getCheckOpinion()); arbitrateRecordnew.setArbitrateReject(arbitrateRecord.getArbitrateReject()); - arbitrateRecordnew.setCaseAppliId(caseApplicationse.getId()); arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordnew); }else { - ArbitrateRecord arbitrateRecordnew1 = new ArbitrateRecord(); - arbitrateRecordnew1.setCheckOpinion(arbitrateRecord.getCheckOpinion()); - arbitrateRecordnew1.setArbitrateReject(arbitrateRecord.getArbitrateReject()); - arbitrateRecordnew1.setCaseAppliId(caseApplicationse.getId()); - arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecordnew1); + arbitrateRecordnew.setCheckOpinion(arbitrateRecord.getCheckOpinion()); + arbitrateRecordnew.setArbitrateReject(arbitrateRecord.getArbitrateReject()); + arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecordsel); } caseApplicationse.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index d3e063a..08861cf 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -879,6 +879,113 @@ order by c.batch_number desc + +