Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

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)

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;
 
 
 

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; // 待仲裁员审核仲裁文书
 }

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<SysRole> 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<SysRole> 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();
             }
+            // 如果是仲裁员，同意后状态改为待部门长审核仲裁文书（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) {//拒绝审核
+            // 如果是仲裁员，拒绝改为待秘书核验仲裁文书（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<CaseAttach> caseAttachs=new ArrayList<>();
                             for (Map.Entry<String, String> 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();

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -87,8 +87,9 @@
                 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 @@
                     <!--仲裁员-->
                     <if test="userId != null and userId != ''">
                         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)
                     </if>
@@ -183,8 +184,9 @@
                 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 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
-                '立案申请'
+                when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
-                WHEN 1 THEN
+                when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
-                '待立案审查'
+                when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
-                WHEN 2 THEN
+                when 12 then '待部门长审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
-                '待缴费'
+                when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
-                WHEN 3 THEN
+                when 18 then '待仲裁员审核仲裁文书'
-                '待缴费确认'
+                when 31 then '待修改开庭时间' ELSE '无案件状态'
-                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 '无案件状态'
                 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)
 
           <!--      <if test="deptIds != null and deptIds.size() > 0">
                     and ca.application_organ_id in
@@ -373,44 +345,14 @@
                 c.case_status,
                 CASE
                 c.case_status
-                WHEN 0 THEN
+                when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
-                '立案申请'
+                when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
-                WHEN 1 THEN
+                when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
-                '待立案审查'
+                when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
-                WHEN 2 THEN
+                when 12 then '待部门长审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
-                '待缴费'
+                when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
-                WHEN 3 THEN
+                when 18 then '待仲裁员审核仲裁文书'
-                '待缴费确认'
+                when 31 then '待修改开庭时间' ELSE '无案件状态'
-                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 '无案件状态'
                 END caseStatusName,
                 c.hear_date,
                 c.arbitrat_claims,
@@ -482,7 +424,12 @@
                                      <if test="caseStatus != null">
                                          AND tt2.case_status = #{caseStatus}
                                      </if>
-
+                                     <if test="caseStatusList != null and caseStatusList.size() > 0">
+                                         and tt2.case_status in
+                                         <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
+                                             #{caseStatus}
+                                         </foreach>
+                                     </if>
                                  </where>
 
             </if>
@@ -503,8 +450,9 @@
         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,
@@ -558,8 +506,9 @@
         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,
@@ -668,6 +617,7 @@
         sum( case when t1.case_status=15 then 1 else 0 end) caseApplyAwardSend,
         sum( case when t1.case_status=16 then 1 else 0 end) caseApplyStored,
         sum( case when t1.case_status=17 then 1 else 0 end) caseApplyArchived,
+        sum( case when t1.case_status=18 then 1 else 0 end) ArbitratorApplyAwardConfirm,
         sum( case when t1.case_status=31 then 1 else 0 end) updateOnlineHearDate
         from(
         <trim suffixOverrides="union">
@@ -701,7 +651,7 @@
                     <!--仲裁员-->
                     <if test="userId != null and userId != ''">
                         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)
                     </if>
@@ -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)
       <!--          <if test="deptIds != null and deptIds.size() > 0">
                     and ca.application_organ_id in
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">
@@ -844,8 +794,9 @@
         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,
@@ -902,6 +853,7 @@
             sum( case when c.case_status=15 then 1 else 0 end) caseApplyAwardSend,
             sum( case when c.case_status=16 then 1 else 0 end) caseApplyStored,
             sum( case when c.case_status=17 then 1 else 0 end) caseApplyArchived,
+            sum( case when c.case_status=18 then 1 else 0 end) ArbitratorApplyAwardConfirm,
             sum( case when c.case_status=31 then 1 else 0 end) updateOnlineHearDate
         FROM
             case_application c
@@ -927,6 +879,7 @@
                                   15,
                                   16,
                                   17,
+                                  18,
                                   31
                 )
 
@@ -960,44 +913,14 @@
         c.case_status,
         CASE
         c.case_status
-        WHEN 0 THEN
+        when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
-        '立案申请'
+        when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
-        WHEN 1 THEN
+        when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
-        '待立案审查'
+        when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
-        WHEN 2 THEN
+        when 12 then '待部门长审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
-        '待缴费'
+        when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
-        WHEN 3 THEN
+        when 18 then '待仲裁员审核仲裁文书'
-        '待缴费确认'
+        when 31 then '待修改开庭时间' ELSE '无案件状态'
-        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 '无案件状态'
         END caseStatusName,
         c.hear_date,
         l.arbitrat_claims,
@@ -1111,44 +1034,14 @@
         c.case_status,
         CASE
         c.case_status
-        WHEN 0 THEN
+        when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
-        '立案申请'
+        when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
-        WHEN 1 THEN
+        when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
-        '待立案审查'
+        when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
-        WHEN 2 THEN
+        when 12 then '待部门长审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
-        '待缴费'
+        when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
-        WHEN 3 THEN
+        when 18 then '待仲裁员审核仲裁文书'
-        '待缴费确认'
+        when 31 then '待修改开庭时间' ELSE '无案件状态'
-        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 '无案件状态'
         END caseStatusName,
         c.hear_date,
         c.arbitrat_claims,
@@ -1221,44 +1114,14 @@
         c.case_status,
         CASE
         c.case_status
-        WHEN 0 THEN
+        when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
-        '立案申请'
+        when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
-        WHEN 1 THEN
+        when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
-        '待立案审查'
+        when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
-        WHEN 2 THEN
+        when 12 then '待部门长审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
-        '待缴费'
+        when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
-        WHEN 3 THEN
+        when 18 then '待仲裁员审核仲裁文书'
-        '待缴费确认'
+        when 31 then '待修改开庭时间' ELSE '无案件状态'
-        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 '无案件状态'
         END caseStatusName,
         c.hear_date,
         l.arbitrat_claims,
@@ -1541,8 +1404,10 @@
         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 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
+        when 18 then '待仲裁员审核仲裁文书'
+        when 31 then '待修改开庭时间'
         ELSE '无案件状态'
         END caseStatusName,
         c.hear_date ,c.arbitrat_claims ,
@@ -1578,8 +1443,10 @@
         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 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
+        when 18 then '待仲裁员审核仲裁文书'
+        when 31 then '待修改开庭时间'
         ELSE '无案件状态'
         END caseStatusName,
         c.hear_date ,c.arbitrat_claims ,
@@ -1609,8 +1476,10 @@
         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 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
+        when 18 then '待仲裁员审核仲裁文书'
+        when 31 then '待修改开庭时间'
                                   ELSE '无案件状态'
                    END caseStatusName,
                c.hear_date ,c.arbitrat_claims ,