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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -50,6 +50,14 @@ public class CaseApplication  extends BaseEntity {
 
     /** 案件状态 */
     private Integer caseStatus;
+
+    /** 申请人是否书面审理 */
+    private Integer applicantIsWrittenHear;
+
+    /** 被申请人是否书面审理 */
+    private Integer respondentIsWrittenHear;
+
+
     /** 案件申请表ID */
     private Long caseAppliId;
 

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java

@@ -38,6 +38,9 @@ public class CaseEvidenceDTO {
     /** 是否管辖异议申请 */
     private Integer objectiJuris;
 
+    /** 被申请人是否书面审理 */
+    private Integer respondentIsWrittenHear;
+
 
     /**
      * 案件仲裁员

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

@@ -1082,6 +1082,15 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, RoundingMode.HALF_UP);
         caseApplication.setFeePayable(feePayable);
         caseApplication.setUpdateBy(getUsername());
+        Integer applicantIsWrittenHear = caseApplication.getApplicantIsWrittenHear();
+        if(applicantIsWrittenHear.intValue()==1){
+            //书面审理
+            caseApplication.setArbitratMethod(2);
+        }else {
+            //开庭审理
+            caseApplication.setArbitratMethod(1);
+        }
+
         // 立案申请状态直接修改主表信息
         if (caseApplication.getCaseStatus() != null && caseApplication.getCaseStatus().equals(CaseApplicationConstants.CASE_APPLICATION)) {
             // 修改内置字段

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

@@ -202,6 +202,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
     }
 
     @Override
+    @Transactional
     public AjaxResult caseCrossexamination(CaseEvidenceDTO caseEvidenceDTO) {
         //查询案件详细信息
         CaseApplication caseApplication = new CaseApplication();
@@ -211,8 +212,6 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
             caseApplication1.setAdjudicaCounterReason(caseEvidenceDTO.getAdjudicaCounterReason());
             int caseStatus = caseApplication1.getCaseStatus();
             caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
-            //默认书面审理
-            caseApplication1.setOpenCourtHear(0);
             caseApplication1.setPendingAppointArbotrar(caseEvidenceDTO.getPendingAppointArbotrar());
             caseApplication1.setAdjudicaCounter(caseEvidenceDTO.getAdjudicaCounter());
             caseApplication1.setObjectiJuris(caseEvidenceDTO.getObjectiJuris());
@@ -227,14 +226,14 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
             }
             //修改案件状态
             caseApplication1.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL_SUBMMIT);
-            //选择仲裁方式
-            if (caseEvidenceDTO.getOpenCourtHear() == null){
-                //没选默认书面审理
-                caseApplication1.setArbitratMethod(2);  //书面审理
-            }else if (caseEvidenceDTO.getOpenCourtHear() == 1){
+
+            Integer respondentIsWrittenHear = caseEvidenceDTO.getRespondentIsWrittenHear();
+            if(respondentIsWrittenHear.intValue()==1){
+                //书面审理
+                caseApplication1.setArbitratMethod(2);
+            }else {
+                //开庭审理
                 caseApplication1.setArbitratMethod(1);
-            } else {
-                caseApplication1.setArbitratMethod(2);  //书面审理
             }
             int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
             if (i > 0) {

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

@@ -31,6 +31,9 @@
         <result property="updateTime"   column="update_time"  />
         <result property="arbitratMethodName"   column="arbitratMethodName"  />
 
+        <result property="applicantIsWrittenHear"   column="appli_iswrit_hear"  />
+        <result property="respondentIsWrittenHear"   column="respon_isWrit_hear"  />
+
         <result property="isAbsence"   column="is_absence"  />
         <result property="responCrossOpin"   column="respon_cross_opin"  />
         <result property="applicaCrossOpin"   column="applica_cross_opin"  />
@@ -1052,7 +1055,7 @@
         <set>
             <if test="caseSubjectAmount != null">case_subject_amount = #{caseSubjectAmount},</if>
             <if test="registerDate != null">register_date = #{registerDate},</if>
-            <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method = #{arbitratMethod},</if>
+            <if test="arbitratMethod != null">arbitrat_method = #{arbitratMethod},</if>
             <if test="hearDate != null ">hear_date = #{hearDate},</if>
             <if test="arbitratClaims != null and arbitratClaims != ''">arbitrat_claims = #{arbitratClaims},</if>
             <if test="requestRule != null and requestRule != ''">request_rule = #{requestRule},</if>
@@ -1073,6 +1076,9 @@
             <if test="caseStatus != null">case_status = #{caseStatus},</if>
             <if test="properPreser != null">proper_preser = #{properPreser},</if>
 
+            <if test="applicantIsWrittenHear != null">appli_iswrit_hear = #{applicantIsWrittenHear},</if>
+            <if test="respondentIsWrittenHear != null">respon_isWrit_hear = #{respondentIsWrittenHear},</if>
+
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
             <if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if>
             <if test="version != null ">version = #{version},</if>
@@ -1164,6 +1170,7 @@
         c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,
         c.batch_number,
         c.facts,
+        c.appli_iswrit_hear,c.respon_isWrit_hear,
         c.mediation_agreement,c.template_id templateId
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1