diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 507632d..2adbd81 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -74,7 +74,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); //生成编码 String equipmentNo = getNewEquipmentNo(); - datas.put("num",equipmentNo); + datas.put("num", equipmentNo); //获取仲裁记录表里的相关信息 ArbitrateRecord arbitrateRecord = new ArbitrateRecord(); arbitrateRecord.setCaseAppliId(id); @@ -102,9 +102,13 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("resAddress", affiliate.getResidenAffili()); datas.put("resSex", affiliate.getResponSex()); Date responBirth = affiliate.getResponBirth(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String responBirthStr = sdf.format(responBirth); - datas.put("resDateOfBirth",responBirthStr); + 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()); } @@ -117,15 +121,15 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("submissionDate", createTimeStr); Date registerDate = caseApplication1.getRegisterDate(); String registerDateStr = sdf.format(registerDate); - datas.put("acceptDate",registerDateStr); + datas.put("acceptDate", registerDateStr); //反请求 Integer adjudicaCounter = caseApplication1.getAdjudicaCounter(); String counterclaim = "在《2022年版仲裁规则》第十八条第（一）项规定的期限内，被申请人向秘书处提交了" + "《仲裁反请求申请书》及证据材料。仲裁委依据《2022年版仲裁规则》第十八条的规定受理了该仲裁反请求案申请。" + "仲裁反请求案件受理后，秘书处向被申请人发送了仲裁反请求通知书及附件，向申请人发送了仲裁反请求通知书及附件、仲裁反请求申请书及附件。"; - if (adjudicaCounter == null){ + if (adjudicaCounter == null) { datas.put("counterclaim", null); - }else if (adjudicaCounter == 1){ + } else if (adjudicaCounter == 1) { datas.put("counterclaim", counterclaim); } else { datas.put("counterclaim", null); @@ -133,10 +137,10 @@ public class AdjudicationServiceImpl implements IAdjudicationService { //财产保全 Integer properPreser = caseApplication1.getProperPreser(); String preservation = "本案受理后，申请人向仲裁委提交了财产保全申请，仲裁委根据《中华人民共和国仲裁法》" + - "第二十八条之规定，将该申请提交至XXX市XXX区法院。"; + "第二十八条之规定，将该申请提交至法院。"; if (properPreser == null) { datas.put("preservation", null); - } else if(properPreser == 1) { + } else if (properPreser == 1) { datas.put("preservation", preservation); } else { datas.put("preservation", null); @@ -145,10 +149,9 @@ public class AdjudicationServiceImpl implements IAdjudicationService { Integer objectiJuris = caseApplication1.getObjectiJuris(); String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《XX管辖异议申请书》，认为XXXXXX" + "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。"; - if (objectiJuris == null){ + 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,24 +160,26 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("arbitratorName", arbitratorName); Integer arbitratMethod = caseApplication1.getArbitratMethod(); Date hearDate = caseApplication1.getHearDate(); - String hearDateStr = sdf.format(hearDate); - //线上开庭时 - if (arbitratMethod == 1) { - String onLine1 = "仲裁庭审阅了申请人提交的仲裁申请书、证据材料后，于"; - String onLine2 = "通过仲裁委智慧仲裁平台开庭审理了本案。"; - datas.put("onLine1", onLine1); - datas.put("hearDate", hearDateStr); - datas.put("onLine2", onLine2); - } else { - //书面仲裁时 - String written1 = "仲裁庭审阅了申请人提交的仲裁申请书、证据材料后，于"; - String written2 = "在仲裁委所在地开庭审理了本案。"; - datas.put("written1", written1); - datas.put("hearDate1", hearDateStr); - datas.put("written2", written2); + if (hearDate!=null){ + String hearDateStr = sdf.format(hearDate); + //线上开庭时 + if (arbitratMethod == 1) { + String onLine1 = "仲裁庭审阅了申请人提交的仲裁申请书、证据材料后，于"; + String onLine2 = "通过仲裁委智慧仲裁平台开庭审理了本案。"; + datas.put("onLine1", onLine1); + datas.put("hearDate", hearDateStr); + datas.put("onLine2", onLine2); + } else { + //书面仲裁时 + String written1 = "仲裁庭审阅了申请人提交的仲裁申请书、证据材料后，于"; + String written2 = "在仲裁委所在地开庭审理了本案。"; + datas.put("written1", written1); + datas.put("hearDate1", hearDateStr); + datas.put("written2", written2); + } } Integer isAbsence = caseApplication1.getIsAbsence(); - if (isAbsence==null){ + if (isAbsence == null) { datas.put("absent1", null); datas.put("absent2", null); datas.put("absent3", 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 = "出席了庭审。被申请人经依法送达开庭通知，无正当理由未出席庭审，故仲裁庭依据" + @@ -298,7 +302,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } return AjaxResult.success("裁决书已生成"); } catch (IOException e) { - return AjaxResult.error(e+"请检查文件路径是否有误"); + return AjaxResult.error(e + "请检查文件路径是否有误"); } } @@ -444,9 +448,9 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } @Override - public AjaxResult caseFile( List ids) { + public AjaxResult caseFile(List ids) { try { - for (Long id :ids) { + for (Long id : ids) { CaseApplication caseApplication = new CaseApplication(); caseApplication.setId(id); //更改案件状态(暂时) @@ -604,7 +608,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); //生成编码 String equipmentNo = getNewEquipmentNo(); - datas.put("num",equipmentNo); + datas.put("num", equipmentNo); //获取仲裁记录相关信息 ArbitrateRecord arbitrateRecord1 = caseApplication.getArbitrateRecord(); @@ -631,10 +635,10 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("resAddress", affiliate.getResidenAffili()); datas.put("resSex", affiliate.getResponSex()); Date responBirth = affiliate.getResponBirth(); - if(responBirth!=null){ + if (responBirth != null) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String responBirthStr = sdf.format(responBirth); - datas.put("resDateOfBirth",responBirthStr); + datas.put("resDateOfBirth", responBirthStr); } datas.put("resContactAddress", affiliate.getContactAddress()); nameAgentList.add(affiliate.getNameAgent()); @@ -648,15 +652,15 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("submissionDate", createTimeStr); Date registerDate = caseApplication1.getRegisterDate(); String registerDateStr = sdf.format(registerDate); - datas.put("acceptDate",registerDateStr); + datas.put("acceptDate", registerDateStr); //反请求 Integer adjudicaCounter = caseApplication1.getAdjudicaCounter(); String counterclaim = "在《2022年版仲裁规则》第十八条第（一）项规定的期限内，被申请人向秘书处提交了" + "《仲裁反请求申请书》及证据材料。仲裁委依据《2022年版仲裁规则》第十八条的规定受理了该仲裁反请求案申请。" + "仲裁反请求案件受理后，秘书处向被申请人发送了仲裁反请求通知书及附件，向申请人发送了仲裁反请求通知书及附件、仲裁反请求申请书及附件。"; - if (adjudicaCounter == null){ + if (adjudicaCounter == null) { datas.put("counterclaim", null); - }else if (adjudicaCounter == 1){ + } else if (adjudicaCounter == 1) { datas.put("counterclaim", counterclaim); } else { datas.put("counterclaim", null); @@ -667,7 +671,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { "第二十八条之规定，将该申请提交至XXX市XXX区法院。"; if (properPreser == null) { datas.put("preservation", null); - } else if(properPreser == 1) { + } else if (properPreser == 1) { datas.put("preservation", preservation); } else { datas.put("preservation", null); @@ -676,10 +680,9 @@ public class AdjudicationServiceImpl implements IAdjudicationService { Integer objectiJuris = caseApplication1.getObjectiJuris(); String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《XX管辖异议申请书》，认为XXXXXX" + "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。"; - if (objectiJuris == null){ + if (objectiJuris == null) { datas.put("jurisdictionalObjection", null); - } - else if (objectiJuris == 1) { + } else if (objectiJuris == 1) { datas.put("jurisdictionalObjection", jurisdictionalObjection); } else { datas.put("jurisdictionalObjection", null); @@ -689,7 +692,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { Integer arbitratMethod = caseApplication1.getArbitratMethod(); Date hearDate = caseApplication1.getHearDate(); String hearDateStr = ""; - if(hearDate!=null){ + if (hearDate != null) { hearDateStr = sdf.format(hearDate); } //线上开庭时 @@ -708,7 +711,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("written2", written2); } Integer isAbsence = caseApplication1.getIsAbsence(); - if (isAbsence==null){ + if (isAbsence == null) { datas.put("absent1", null); datas.put("absent2", null); datas.put("absent3", 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 = "出席了庭审。被申请人经依法送达开庭通知，无正当理由未出席庭审，故仲裁庭依据" + @@ -837,8 +839,8 @@ public class AdjudicationServiceImpl implements IAdjudicationService { String annexPath = "/uploadPath" + annexName.substring(startIndex); caseAttach.setAnnexPath(annexPath); int startIndexnew = annexName.lastIndexOf("/"); - if(startIndexnew!=-1){ - String annexNamenew = annexName.substring(startIndexnew+1); + if (startIndexnew != -1) { + String annexNamenew = annexName.substring(startIndexnew + 1); caseAttach.setAnnexName(annexNamenew); } 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 6d6c78b..fc175d9 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 @@ -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); //书面审理