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

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

@@ -102,9 +102,13 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                         datas.put("resAddress", affiliate.getResidenAffili());
                         datas.put("resSex", affiliate.getResponSex());
                         Date responBirth = affiliate.getResponBirth();
+                        if (responBirth != null) {
                             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                             String responBirthStr = sdf.format(responBirth);
                             datas.put("resDateOfBirth", responBirthStr);
+
+                        }
+
                         datas.put("resContactAddress", affiliate.getContactAddress());
                         nameAgentList.add(affiliate.getNameAgent());
                     }
@@ -133,7 +137,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             //财产保全
             Integer properPreser = caseApplication1.getProperPreser();
             String preservation = "本案受理后，申请人向仲裁委提交了财产保全申请，仲裁委根据《中华人民共和国仲裁法》" +
-                    "第二十八条之规定，将该申请提交至XXX市XXX区法院。";
+                    "第二十八条之规定，将该申请提交至法院。";
             if (properPreser == null) {
                 datas.put("preservation", null);
             } else if (properPreser == 1) {
@@ -147,8 +151,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                     "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。";
             if (objectiJuris == null) {
                 datas.put("jurisdictionalObjection", null);
-            }
+            } else if (objectiJuris == 1) {
-            else if (objectiJuris == 1) {
                 datas.put("jurisdictionalObjection", jurisdictionalObjection);
             } else {
                 datas.put("jurisdictionalObjection", null);
@@ -157,6 +160,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             datas.put("arbitratorName", arbitratorName);
             Integer arbitratMethod = caseApplication1.getArbitratMethod();
             Date hearDate = caseApplication1.getHearDate();
+            if (hearDate!=null){
                 String hearDateStr = sdf.format(hearDate);
                 //线上开庭时
                 if (arbitratMethod == 1) {
@@ -173,6 +177,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                     datas.put("hearDate1", hearDateStr);
                     datas.put("written2", written2);
                 }
+            }
             Integer isAbsence = caseApplication1.getIsAbsence();
             if (isAbsence == null) {
                 datas.put("absent1", null);
@@ -190,8 +195,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                 datas.put("appAgentName1", null);
                 datas.put("appAgentName2", null);
                 datas.put("resAgentName", null);
-            }
+            } else if (isAbsence == 1) {
-           else if (isAbsence == 1) {
                 //缺席审理
                 String absent1 = "申请人的特别授权委托代理人";
                 String absent2 = "出席了庭审。被申请人经依法送达开庭通知，无正当理由未出席庭审，故仲裁庭依据" +
@@ -678,8 +682,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                     "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。";
             if (objectiJuris == null) {
                 datas.put("jurisdictionalObjection", null);
-            }
+            } else if (objectiJuris == 1) {
-            else if (objectiJuris == 1) {
                 datas.put("jurisdictionalObjection", jurisdictionalObjection);
             } else {
                 datas.put("jurisdictionalObjection", null);
@@ -724,8 +727,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                 datas.put("appAgentName1", null);
                 datas.put("appAgentName2", null);
                 datas.put("resAgentName", null);
-            }
+            } else if (isAbsence == 1) {
-            else if (isAbsence == 1) {
                 //缺席审理
                 String absent1 = "申请人的特别授权委托代理人";
                 String absent2 = "出席了庭审。被申请人经依法送达开庭通知，无正当理由未出席庭审，故仲裁庭依据" +

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

@@ -192,7 +192,8 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
         if (caseApplication1 != null) {
             int caseStatus = caseApplication1.getCaseStatus();
             caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
-            caseApplication1.setOpenCourtHear(caseEvidenceDTO.getOpenCourtHear());
+            //默认书面审理
+            caseApplication1.setOpenCourtHear(0);
             caseApplication1.setPendingAppointArbotrar(caseEvidenceDTO.getPendingAppointArbotrar());
             caseApplication1.setAdjudicaCounter(caseEvidenceDTO.getAdjudicaCounter());
             caseApplication1.setObjectiJuris(caseEvidenceDTO.getObjectiJuris());
@@ -208,7 +209,10 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
             //修改案件状态
             caseApplication1.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL_SUBMMIT);
             //选择仲裁方式
-            if (caseEvidenceDTO.getOpenCourtHear() == 1) {   //开庭审理
+            if (caseEvidenceDTO.getOpenCourtHear() == null){
+                //没选默认书面审理
+                caseApplication1.setArbitratMethod(2);  //书面审理
+            }else if (caseEvidenceDTO.getOpenCourtHear() == 1){
                 caseApplication1.setArbitratMethod(1);
             } else {
                 caseApplication1.setArbitratMethod(2);  //书面审理