From 93d9e1168875af9750e0b9e9392523ffb8645ff5 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 5 Dec 2023 11:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E6=B5=81=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 2 +- .../constant/CaseApplicationConstants.java | 6 +- .../wisdomarbitrate/domain/vo/ToDoCount.java | 1 + .../impl/CaseApplicationServiceImpl.java | 54 +++- .../wisdomarbitrate/CaseApplicationMapper.xml | 301 +++++------------- 5 files changed, 137 insertions(+), 227 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index e3b4e93..5893d81 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -273,7 +273,7 @@ public class CaseApplicationController extends BaseController { } /** - * 审核裁决书 + * 部门长审核裁决书 */ // @PreAuthorize("@ss.hasPermi('caseApplication:checkArbitrateRecord')") @Log(title = "审核裁决书", businessType = BusinessType.UPDATE) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java index 33cb946..e7802e4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java @@ -30,9 +30,9 @@ public class CaseApplicationConstants { public static final int PENDING_WRIITEN_HEAR = 9; /** 待生成仲裁文书 */ public static final int GENERATED_ARBITRATION = 10; - /**待核验仲裁文书*/ + /**待秘书核验仲裁文书*/ public static final int VERPRIF_ARBITRATION = 11; - /**待审核仲裁文书*/ + /**待部门长审核仲裁文书*/ public static final int CHECK_ARBITRATION = 12; /**待仲裁文书签名*/ public static final int SIGN_ARBITRATION = 13; @@ -47,6 +47,8 @@ public class CaseApplicationConstants { /** 待修改开庭时间*/ public static final int MODIFY_HEARDATE = 31; + /**待仲裁员审核仲裁文书*/ + public static final int HEAD_CHECK_ARBITRATION = 18; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java index b16db6f..de0e732 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java @@ -30,4 +30,5 @@ public class ToDoCount { private int caseApplyStored=0; // 待案件归档 private int caseApplyArchived=0; // 已归档 private int updateOnlineHearDate=0; // 待修改开庭时间 + private int ArbitratorApplyAwardConfirm=0; // 待仲裁员审核仲裁文书 } 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 616ba2d..ce8749f 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 @@ -256,7 +256,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { SysUser user = loginUser.getUser(); Long userId = user.getUserId(); - // 查询登录人身份证号 + // 查询登录人信息 SysUser sysUser = sysUserMapper.selectUserById(userId); List roles = sysUser.getRoles(); // 没有角色不能查看案件列表 @@ -1905,19 +1905,42 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override @Transactional public int verificationArbitrateRecord(CaseApplication caseApplication) { - caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION); + // 秘书核验裁决书，流转到待仲裁员审核仲裁文书 + caseApplication.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION); int rows = caseApplicationMapper.submitCaseApplication(caseApplication); ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord(); arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord); // 新增日志 - insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION, ""); + insertCaseLog(caseApplication.getId(), CaseApplicationConstants.HEAD_CHECK_ARBITRATION, ""); return rows; } + /** + * 仲裁员，部门长审核裁决书 + * @param caseApplication + * @return + */ @Override @Transactional public AjaxResult checkArbitrateRecord(CaseApplication caseApplication) { + // 查询当前登录人角色 + LoginUser loginUser = getLoginUser(); + // 查询登录人角色 + SysUser user = sysUserMapper.selectUserById(loginUser.getUser().getUserId()); + List roles = user.getRoles(); if (CollectionUtil.isEmpty(roles)) { + throw new ServiceException("该用户没有角色权限"); + } + String roleName=""; + for (SysRole role : roles) { + if (StrUtil.isEmpty(role.getRoleName())) { + continue; + } + roleName=role.getRoleName(); + } + // 如果是仲裁员，同意后状态改为待部门长审核仲裁文书（CHECK_ARBITRATION = 12），拒绝改为待秘书核验仲裁文书（VERPRIF_ARBITRATION = 11） + // 如果是部门长，同意后状态改为待仲裁文书签名（SIGN_ARBITRATION = 13），拒绝改为待仲裁员审核仲裁文书（HEAD_CHECK_ARBITRATION = 18） + int rows = 0; ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord(); arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord); @@ -2102,15 +2125,30 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } catch (InterruptedException e) { e.printStackTrace(); } - caseApplication.setCaseStatus(CaseApplicationConstants.SIGN_ARBITRATION); + // 如果是仲裁员，同意后状态改为待部门长审核仲裁文书（CHECK_ARBITRATION = 12） + if(roleName.contains("仲裁员")){ + caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION); + }else if(roleName.contains("仲裁委")||roleName.contains("部门长")){ + // 如果是部门长，同意后状态改为待仲裁文书签名（SIGN_ARBITRATION = 13）， + caseApplication.setCaseStatus(CaseApplicationConstants.SIGN_ARBITRATION); + } + + + // 新增日志 - insertCaseLog(caseApplication.getId(), CaseApplicationConstants.SIGN_ARBITRATION, ""); + insertCaseLog(caseApplication.getId(), caseApplication.getCaseStatus(), ""); rows = caseApplicationMapper.submitCaseApplication(caseApplication); } else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核 - caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION); + // 如果是仲裁员，拒绝改为待秘书核验仲裁文书（VERPRIF_ARBITRATION = 11） + if(roleName.contains("仲裁员")){ + caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION); + }else if(roleName.contains("仲裁委")||roleName.contains("部门长")){ + // 如果是部门长，拒绝改为待仲裁员审核仲裁文书（HEAD_CHECK_ARBITRATION = 18） + caseApplication.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION); + } // 新增日志 - insertCaseLog(caseApplication.getId(), CaseApplicationConstants.VERPRIF_ARBITRATION, ""); + insertCaseLog(caseApplication.getId(), caseApplication.getCaseStatus(), ""); rows = caseApplicationMapper.submitCaseApplication(caseApplication); } @@ -3119,7 +3157,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { if (null != caseApplication.getId()) { List caseAttachs=new ArrayList<>(); for (Map.Entry entry : andConvertPDF.entrySet()) { - if(entry.getValue().contains("证据材料")){ + if(entry.getValue().contains("证据材料")||entry.getValue().contains("申请书")||entry.getValue().contains("调解协议")||entry.getValue().contains("情况说明")){ String pdfUrl = entry.getValue(); File file1 = new File(pdfUrl); CaseAttach caseAttach = new CaseAttach(); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index db30144..f3f7d79 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -83,12 +83,13 @@ ELSE '无审理方式' END arbitratMethodName, c.case_status , - CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' + CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核' when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理' when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书' - when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印' + when 12 then '待部门长审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印' when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档' + when 18 then '待仲裁员审核仲裁文书' when 31 then '待修改开庭时间' ELSE '无案件状态' END caseStatusName, @@ -133,7 +134,7 @@ or ( t.identity_type=1 and - t.case_status in (7,11,13,17) + t.case_status in (7,13,17,18) and instr (t.arbitrator_id,#{userId})>0) @@ -179,12 +180,13 @@ ELSE '无审理方式' END arbitratMethodName, c.case_status , - CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' + CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核' when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理' when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书' - when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印' + when 12 then '待部门长审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印' when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档' + when 18 then '待仲裁员审核仲裁文书' when 31 then '待修改开庭时间' ELSE '无案件状态' END caseStatusName, @@ -246,44 +248,14 @@ c.case_status, CASE c.case_status - WHEN 0 THEN - '立案申请' - WHEN 1 THEN - '待立案审查' - WHEN 2 THEN - '待缴费' - WHEN 3 THEN - '待缴费确认' - WHEN 4 THEN - '待案件质证' - WHEN 5 THEN - '待组庭审核' - WHEN 6 THEN - '待组庭确定' - WHEN 7 THEN - '待审核仲裁方式' - WHEN 8 THEN - '待开庭审理' - WHEN 9 THEN - '待书面审理' - WHEN 10 THEN - '待生成仲裁文书' - WHEN 11 THEN - '待核验仲裁文书' - WHEN 12 THEN - '待审核仲裁文书' - WHEN 13 THEN - '待仲裁文书签名' - WHEN 14 THEN - '待仲裁文书用印' - WHEN 15 THEN - '待仲裁文书送达' - WHEN 16 THEN - '待案件归档' - WHEN 17 THEN - '已归档' - WHEN 31 THEN - '待修改开庭时间' ELSE '无案件状态' + when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' + when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核' + when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理' + when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书' + when 12 then '待部门长审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印' + when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档' + when 18 then '待仲裁员审核仲裁文书' + when 31 then '待修改开庭时间' ELSE '无案件状态' END caseStatusName, c.hear_date, c.arbitrat_claims, @@ -323,7 +295,7 @@ WHERE ca.identity_type=1 - and c.case_status in (1,5,8,9,14,15,16,17,31) + and c.case_status in (1,5,8,9,11,14,15,16,17,31) or ( t.identity_type=1 and - t.case_status in (7,11,13,17) + t.case_status in (7,13,17,18) and instr (t.arbitrator_id,#{userId})>0) @@ -796,7 +746,7 @@ WHERE ca.identity_type=1 - and c.case_status in (1,5,8,9,14,15,16,17,31) + and c.case_status in (1,5,8,9,11,14,15,16,17,31)