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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java

@@ -104,8 +104,6 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
                     }
                 }
             }
-            // 新增日志
-            CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_OPENCOURT_HEAR,"");
 
             return AjaxResult.success("审核成功");
         }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java

@@ -1,8 +1,10 @@
 package com.ruoyi.wisdomarbitrate.utils;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
 import com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper;
 
@@ -17,6 +19,7 @@ import javax.validation.constraints.NotNull;
 public class CaseLogUtils
 {
     private static CaseLogRecordMapper caseLogRecordMapper= SpringUtil.getBean(CaseLogRecordMapper.class);
+    private static SysUserMapper userMapper= SpringUtil.getBean(SysUserMapper.class);
 
     /**
      * 新增案件日志
@@ -25,13 +28,15 @@ public class CaseLogUtils
      * @param notes 备注
      */
     public static void insertCaseLog(@NotNull Long caseAppliId, @NotEmpty Integer caseNode, String notes  ){
+        CaseLogRecord operLog = new CaseLogRecord();
         // 获取当前的用户
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String nickName = loginUser.getUser().getNickName();
-        CaseLogRecord operLog = new CaseLogRecord();
-        operLog.setCreateBy(loginUser.getUsername());
-        operLog.setCreateNickName(nickName);
-        operLog.setUpdateBy(loginUser.getUsername());
+        if(loginUser!=null) {
+            SysUser sysUser = userMapper.selectUserById(loginUser.getUserId());
+            operLog.setCreateBy(sysUser.getUserName());
+            operLog.setCreateNickName(sysUser.getNickName());
+            operLog.setUpdateBy(sysUser.getUserName());
+        }
         operLog.setCaseAppliId(caseAppliId);
         operLog.setCaseNode(caseNode);
         operLog.setNotes(notes);

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

@@ -25,8 +25,8 @@
             cl.create_by createBy,cl.create_nick_name createNickName,cl.create_time createTime,cl.update_by updateBy,cl.update_time updateTime,
         CASE cl.case_node 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 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 26 then '证据确认成功'