Selaa lähdekoodia

增加是否书面审理

qitz 2 vuotta sitten
vanhempi
commit
61f8638635

+ 8
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Näytä tiedosto

50
 
50
 
51
     /** 案件状态 */
51
     /** 案件状态 */
52
     private Integer caseStatus;
52
     private Integer caseStatus;
53
+
54
+    /** 申请人是否书面审理 */
55
+    private Integer applicantIsWrittenHear;
56
+
57
+    /** 被申请人是否书面审理 */
58
+    private Integer respondentIsWrittenHear;
59
+
60
+
53
     /** 案件申请表ID */
61
     /** 案件申请表ID */
54
     private Long caseAppliId;
62
     private Long caseAppliId;
55
 
63
 

+ 3
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java Näytä tiedosto

38
     /** 是否管辖异议申请 */
38
     /** 是否管辖异议申请 */
39
     private Integer objectiJuris;
39
     private Integer objectiJuris;
40
 
40
 
41
+    /** 被申请人是否书面审理 */
42
+    private Integer respondentIsWrittenHear;
43
+
41
 
44
 
42
     /**
45
     /**
43
      * 案件仲裁员
46
      * 案件仲裁员

+ 9
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Näytä tiedosto

1082
         BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, RoundingMode.HALF_UP);
1082
         BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, RoundingMode.HALF_UP);
1083
         caseApplication.setFeePayable(feePayable);
1083
         caseApplication.setFeePayable(feePayable);
1084
         caseApplication.setUpdateBy(getUsername());
1084
         caseApplication.setUpdateBy(getUsername());
1085
+        Integer applicantIsWrittenHear = caseApplication.getApplicantIsWrittenHear();
1086
+        if(applicantIsWrittenHear.intValue()==1){
1087
+            //书面审理
1088
+            caseApplication.setArbitratMethod(2);
1089
+        }else {
1090
+            //开庭审理
1091
+            caseApplication.setArbitratMethod(1);
1092
+        }
1093
+
1085
         // 立案申请状态直接修改主表信息
1094
         // 立案申请状态直接修改主表信息
1086
         if (caseApplication.getCaseStatus() != null && caseApplication.getCaseStatus().equals(CaseApplicationConstants.CASE_APPLICATION)) {
1095
         if (caseApplication.getCaseStatus() != null && caseApplication.getCaseStatus().equals(CaseApplicationConstants.CASE_APPLICATION)) {
1087
             // 修改内置字段
1096
             // 修改内置字段

+ 8
- 9
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java Näytä tiedosto

202
     }
202
     }
203
 
203
 
204
     @Override
204
     @Override
205
+    @Transactional
205
     public AjaxResult caseCrossexamination(CaseEvidenceDTO caseEvidenceDTO) {
206
     public AjaxResult caseCrossexamination(CaseEvidenceDTO caseEvidenceDTO) {
206
         //查询案件详细信息
207
         //查询案件详细信息
207
         CaseApplication caseApplication = new CaseApplication();
208
         CaseApplication caseApplication = new CaseApplication();
211
             caseApplication1.setAdjudicaCounterReason(caseEvidenceDTO.getAdjudicaCounterReason());
212
             caseApplication1.setAdjudicaCounterReason(caseEvidenceDTO.getAdjudicaCounterReason());
212
             int caseStatus = caseApplication1.getCaseStatus();
213
             int caseStatus = caseApplication1.getCaseStatus();
213
             caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
214
             caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
214
-            //默认书面审理
215
-            caseApplication1.setOpenCourtHear(0);
216
             caseApplication1.setPendingAppointArbotrar(caseEvidenceDTO.getPendingAppointArbotrar());
215
             caseApplication1.setPendingAppointArbotrar(caseEvidenceDTO.getPendingAppointArbotrar());
217
             caseApplication1.setAdjudicaCounter(caseEvidenceDTO.getAdjudicaCounter());
216
             caseApplication1.setAdjudicaCounter(caseEvidenceDTO.getAdjudicaCounter());
218
             caseApplication1.setObjectiJuris(caseEvidenceDTO.getObjectiJuris());
217
             caseApplication1.setObjectiJuris(caseEvidenceDTO.getObjectiJuris());
227
             }
226
             }
228
             //修改案件状态
227
             //修改案件状态
229
             caseApplication1.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL_SUBMMIT);
228
             caseApplication1.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL_SUBMMIT);
230
-            //选择仲裁方式
231
-            if (caseEvidenceDTO.getOpenCourtHear() == null){
232
-                //没选默认书面审理
233
-                caseApplication1.setArbitratMethod(2);  //书面审理
234
-            }else if (caseEvidenceDTO.getOpenCourtHear() == 1){
229
+
230
+            Integer respondentIsWrittenHear = caseEvidenceDTO.getRespondentIsWrittenHear();
231
+            if(respondentIsWrittenHear.intValue()==1){
232
+                //书面审理
233
+                caseApplication1.setArbitratMethod(2);
234
+            }else {
235
+                //开庭审理
235
                 caseApplication1.setArbitratMethod(1);
236
                 caseApplication1.setArbitratMethod(1);
236
-            } else {
237
-                caseApplication1.setArbitratMethod(2);  //书面审理
238
             }
237
             }
239
             int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
238
             int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
240
             if (i > 0) {
239
             if (i > 0) {

+ 8
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Näytä tiedosto

31
         <result property="updateTime"   column="update_time"  />
31
         <result property="updateTime"   column="update_time"  />
32
         <result property="arbitratMethodName"   column="arbitratMethodName"  />
32
         <result property="arbitratMethodName"   column="arbitratMethodName"  />
33
 
33
 
34
+        <result property="applicantIsWrittenHear"   column="appli_iswrit_hear"  />
35
+        <result property="respondentIsWrittenHear"   column="respon_isWrit_hear"  />
36
+
34
         <result property="isAbsence"   column="is_absence"  />
37
         <result property="isAbsence"   column="is_absence"  />
35
         <result property="responCrossOpin"   column="respon_cross_opin"  />
38
         <result property="responCrossOpin"   column="respon_cross_opin"  />
36
         <result property="applicaCrossOpin"   column="applica_cross_opin"  />
39
         <result property="applicaCrossOpin"   column="applica_cross_opin"  />
1052
         <set>
1055
         <set>
1053
             <if test="caseSubjectAmount != null">case_subject_amount = #{caseSubjectAmount},</if>
1056
             <if test="caseSubjectAmount != null">case_subject_amount = #{caseSubjectAmount},</if>
1054
             <if test="registerDate != null">register_date = #{registerDate},</if>
1057
             <if test="registerDate != null">register_date = #{registerDate},</if>
1055
-            <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method = #{arbitratMethod},</if>
1058
+            <if test="arbitratMethod != null">arbitrat_method = #{arbitratMethod},</if>
1056
             <if test="hearDate != null ">hear_date = #{hearDate},</if>
1059
             <if test="hearDate != null ">hear_date = #{hearDate},</if>
1057
             <if test="arbitratClaims != null and arbitratClaims != ''">arbitrat_claims = #{arbitratClaims},</if>
1060
             <if test="arbitratClaims != null and arbitratClaims != ''">arbitrat_claims = #{arbitratClaims},</if>
1058
             <if test="requestRule != null and requestRule != ''">request_rule = #{requestRule},</if>
1061
             <if test="requestRule != null and requestRule != ''">request_rule = #{requestRule},</if>
1073
             <if test="caseStatus != null">case_status = #{caseStatus},</if>
1076
             <if test="caseStatus != null">case_status = #{caseStatus},</if>
1074
             <if test="properPreser != null">proper_preser = #{properPreser},</if>
1077
             <if test="properPreser != null">proper_preser = #{properPreser},</if>
1075
 
1078
 
1079
+            <if test="applicantIsWrittenHear != null">appli_iswrit_hear = #{applicantIsWrittenHear},</if>
1080
+            <if test="respondentIsWrittenHear != null">respon_isWrit_hear = #{respondentIsWrittenHear},</if>
1081
+
1076
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
1082
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
1077
             <if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if>
1083
             <if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if>
1078
             <if test="version != null ">version = #{version},</if>
1084
             <if test="version != null ">version = #{version},</if>
1164
         c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,
1170
         c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,
1165
         c.batch_number,
1171
         c.batch_number,
1166
         c.facts,
1172
         c.facts,
1173
+        c.appli_iswrit_hear,c.respon_isWrit_hear,
1167
         c.mediation_agreement,c.template_id templateId
1174
         c.mediation_agreement,c.template_id templateId
1168
         from case_application c
1175
         from case_application c
1169
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
1176
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1