diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
index cf5d739..a92310b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+++ b/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;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java
index 2a9caa3..b412ede 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java
+++ b/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;
+
/**
* 案件仲裁员
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index 6009f1c..3f396ac 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/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)) {
// 修改内置字段
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java
index 0453e4b..5899238 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java
+++ b/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) {
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index 6654cb2..d7e4b92 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -31,6 +31,9 @@
+
+
+
@@ -1052,7 +1055,7 @@
case_subject_amount = #{caseSubjectAmount},
register_date = #{registerDate},
- arbitrat_method = #{arbitratMethod},
+ arbitrat_method = #{arbitratMethod},
hear_date = #{hearDate},
arbitrat_claims = #{arbitratClaims},
request_rule = #{requestRule},
@@ -1073,6 +1076,9 @@
case_status = #{caseStatus},
proper_preser = #{properPreser},
+ appli_iswrit_hear = #{applicantIsWrittenHear},
+ respon_isWrit_hear = #{respondentIsWrittenHear},
+
update_by = #{updateBy},
case_num = #{caseNum},
version = #{version},
@@ -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