Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

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

@@ -489,6 +489,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
         }
+        // 新增日志
+        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_PAYMENT,"");
+
         return rows;
     }
 

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

@@ -38,7 +38,7 @@ public class CaseLogRecordServiceImpl  implements ICaseLogRecordService {
                         contentBuilder.append("提交立案申请");
                         break;
                     case  2:
-                        contentBuilder.append("提交立案审查");
+                        contentBuilder.append("立案审查");
                         break;
                     case  3:
                         contentBuilder.append("支付成功");

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

@@ -66,7 +66,7 @@
             <if test="caseNum != null and caseNum != ''">
                 AND c.case_num = #{caseNum}
             </if>
-            <if test="name != null and name != ''">
+            <if test="nameId != null and nameId != ''">
                 AND ca.NAME=#{nameId}  AND ca.identity_type=1 and ca.name=d.dept_id
             </if>
             <if test="caseStatusList != null and caseStatusList.size() > 0">

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

@@ -22,7 +22,7 @@
     </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_by createBy,cl.create_nick_name createNickName,cl.create_time createTime,cl.update_by updateBy,cl.update_time updateTime
             from case_log_record cl
 
             <where>
@@ -31,7 +31,7 @@
                     AND cl.case_appli_id = #{caseAppliId}
                 </if>
             </where>
-            order by create_time desc
+            order by create_time asc
 
     </select>