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

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

@@ -646,11 +646,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     @Override
     @Transactional
     public int pendTralCheck(CaseApplication caseApplication) {
-        int isAgreePendTral = caseApplication.getIsAgreePendTral();
+        Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
         caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
         int rows = 0;
         //同意组庭
-        if(isAgreePendTral==1){
+        if(isAgreePendTral!=null&&isAgreePendTral==1){
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
         }else {
             List<Arbitrator> arbitrators = caseApplication.getArbitrators();

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

@@ -30,67 +30,9 @@ public class CaseLogRecordServiceImpl  implements ICaseLogRecordService {
                 }
 
                 contentBuilder.append(record.getCreateNickName()).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
-                switch(record.getCaseNode()){
-                  case  0:
-                      contentBuilder.append("创建立案申请");
-                      break;
-                    case  1:
-                        contentBuilder.append("提交立案申请");
-                        break;
-                    case  2:
-                        contentBuilder.append("立案审查");
-                        break;
-                    case  3:
-                        contentBuilder.append("支付成功");
-                        break;
-                    case  4:
-                        contentBuilder.append("缴费确认");
-                        break;
-                    case  5:
-                        contentBuilder.append("案件质证");
-                        break;
-                    case  6:
-                        contentBuilder.append("组庭审核");
-                        break;
-                    case  7:
-                        contentBuilder.append("组庭确认");
-                        break;
-                    case  8:
-                        contentBuilder.append("待开庭审理");
-                        break;
-                    case  9:
-                        contentBuilder.append("待书面审理");
-                        break;
-                    case  10:
-                        contentBuilder.append("书面审理");
-                        break;
-                    case  11:
-                        contentBuilder.append("审核裁决书，拒绝");
-                        break;
-                    case  12:
-                        contentBuilder.append("核验裁决书");
-                        break;
-                    case  13:
-                        contentBuilder.append("审核裁决书，同意");
-                        break;
-                    case  14:
-                        contentBuilder.append("签名成功");
-                        break;
-                    case  15:
-                        contentBuilder.append("用印成功");
-                        break;
-                    case  16:
-                        contentBuilder.append("送达仲裁文书");
-                        break;
-                    case  17:
-                        contentBuilder.append("案件归档");
-                        break;
-                    case  26:
-                        contentBuilder.append("证据确认成功");
-                        break;
-                    default:break;
+                if(StrUtil.isNotEmpty(record.getContent())){
+                    contentBuilder.append(record.getContent());
                 }
-
                 record.setContent(contentBuilder.toString());
 
             });

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

@@ -49,13 +49,13 @@
                             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 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
                             ELSE '无案件状态'
                             END caseStatusName,
         c.hear_date ,c.arbitrat_claims ,
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
-        c.update_by ,c.update_time , c.arbitrator_name,d.dept_name as applicantName
+        c.update_by ,c.update_time , c.arbitrator_name,d.dept_name as applicantName,c.register_date
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
         LEFT JOIN sys_dept d ON ca.NAME = d.dept_id and ca.name=d.dept_id
@@ -93,7 +93,7 @@
 
         <if test="caseNum != null and caseNum != ''">case_num,</if>
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
-        <if test="registerDate != null">register_date,</if>
+        register_date,
         <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method,</if>
         <if test="caseStatus != null ">case_status,</if>
         <if test="hearDate != null ">hear_date,</if>
@@ -114,7 +114,7 @@
         )values(
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
-        <if test="registerDate != null">#{registerDate},</if>
+       sysdate(),
         <if test="arbitratMethod != null and arbitratMethod != ''">#{arbitratMethod},</if>
         <if test="caseStatus != null ">#{caseStatus},</if>
         <if test="hearDate != null ">#{hearDate},</if>

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

@@ -22,7 +22,16 @@
     </insert>
     <select id="selectCaseLogRecordList" resultType="com.ruoyi.wisdomarbitrate.domain.CaseLogRecord">
             select cl.case_node caseNode ,cl.case_node_time caseNodeTime ,cl.notes  ,cl.id ,cl.case_appli_id caseAppliId,
-            cl.create_by createBy,cl.create_nick_name createNickName,cl.create_time createTime,cl.update_by updateBy,cl.update_time updateTime
+            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 12 then '核验裁决书' when 13 then '同意裁决书' when 14 then '签名成功'
+        when 15 then '用印成功' when 16 then '送达仲裁文书' when 17 then '案件归档'
+        when 26 then '证据确认成功'
+        ELSE '无案件状态'
+        END content
             from case_log_record cl
 
             <where>