bug修改

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

     @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/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

                             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
 
         <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>
         )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>