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 ff37315..11f25a4 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 @@ -154,7 +154,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } //管辖权异议 Integer objectiJuris = caseApplication1.getObjectiJuris(); - String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《XX管辖异议申请书》，认为XXXXXX" + + String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《管辖异议申请书》，认为" + "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。"; if (objectiJuris == null) { datas.put("jurisdictionalObjection", null); @@ -284,21 +284,21 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } } } - datas.put("applicaCrossOpin", caseApplication1.getApplicaCrossOpin()); - if (arbitrateRecord1 != null) { - datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); - datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); - datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); - } + datas.put("applicaCrossOpin", "被申请人证据不足,无法说明事实"); + + datas.put("factDetermi", "被申请人欠款属实"); + datas.put("arbitrateThink", " 被申请人应按约定还款"); + datas.put("rulingFollows", "被申请人依法偿还申请人欠款"); + LocalDate now = LocalDate.now(); String year = Integer.toString(now.getYear()); datas.put("year", year); String month = String.format("%02d", now.getMonthValue()); String day = String.format("%02d", now.getDayOfMonth()); String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx"; - // String modalFilePath = "D:/develop/新裁决书模板.docx"; + // String modalFilePath = "D:/develop/新裁决书模板.docx"; String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; - // String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day; + // String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day; String fileName = UUID.randomUUID().toString().replace("-", "") + ".docx"; String saveName = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName; String resultFilePath = saveFolderPath + "/" + fileName; @@ -603,7 +603,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { try { Boolean aBoolean = emailOutUtil.sendEmil(appEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); Boolean aBoolean1 = emailOutUtil.sendEmil(resEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); - if (aBoolean && aBoolean1){ + if (aBoolean && aBoolean1) { return Boolean.TRUE; } } catch (Exception e) { @@ -739,7 +739,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } //管辖权异议 Integer objectiJuris = caseApplication1.getObjectiJuris(); - String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《XX管辖异议申请书》，认为XXXXXX" + + String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《管辖异议申请书》，认为" + "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。"; if (objectiJuris == null) { datas.put("jurisdictionalObjection", null); @@ -870,12 +870,12 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } } } - datas.put("applicaCrossOpin", caseApplication1.getApplicaCrossOpin()); - if (arbitrateRecord1 != null) { - datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); - datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); - datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); - } + datas.put("applicaCrossOpin", "被申请人证据不足,无法说明事实"); + + datas.put("factDetermi", "被申请人欠款属实"); + datas.put("arbitrateThink", "被申请人应按约定还款"); + datas.put("rulingFollows", "被申请人依法偿还申请人欠款"); + LocalDate now = LocalDate.now(); String year = Integer.toString(now.getYear()); datas.put("year", year); 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 e2fd1f3..ea4f4aa 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 @@ -282,7 +282,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Transactional public int updateHeardate(CaseApplication caseApplication) { // caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); - caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); + caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); int rows = caseApplicationMapper.submitCaseApplication(caseApplication); //1975139 修改开庭时间通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已改为{3}，请知晓，如非本人操作，请忽略本短信 //发送短信通知 @@ -292,7 +292,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { // 发送开庭日期通知短信 sendHearDateMessage(caseApplication, request, "1975139"); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION_METHOD, ""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, ""); return rows; } @@ -2128,13 +2128,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { datas.put("hearDay", null); } datas.put("appArbitrationClaims", caseApplication.getArbitratClaims()); - if (arbitrateRecord1 != null) { - datas.put("evidenDetermi", arbitrateRecord1.getEvidenDetermi()); - datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); - datas.put("caseSketch", arbitrateRecord1.getCaseSketch()); - datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); - datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); - } + datas.put("evidenDetermi", "认定为申请人证据充足"); + datas.put("factDetermi", "被申请人欠款属实"); + datas.put("caseSketch", "申请人所求通过"); + datas.put("arbitrateThink", "被申请人应按约定还款"); + datas.put("rulingFollows", "被申请人依法偿还申请人欠款"); datas.put("legalProvisions", "仲裁法"); LocalDate now = LocalDate.now(); String year = Integer.toString(now.getYear()); @@ -2268,9 +2266,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication); String caseNum = caseApplicationselect.getCaseNum(); - Date hearDate = caseApplicationselect.getHearDate(); + //Date hearDate = caseApplicationselect.getHearDate(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String hearDatestr = dateFormat.format(hearDate); + String hearDatestr = null; String arbitratorId = caseApplicationselect.getArbitratorId(); // List arbitratorList = new ArrayList<>(); if (StringUtils.isNotEmpty(arbitratorId)) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java index 6ad6e0b..d942a5d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java @@ -533,12 +533,10 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { } } } - datas.put("applicaCrossOpin", caseApplication1.getApplicaCrossOpin()); - if (arbitrateRecord1 != null) { - datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); - datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); - datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); - } + datas.put("applicaCrossOpin", "被申请人证据不足,无法说明事实"); + datas.put("factDetermi", "被申请人欠款属实"); + datas.put("arbitrateThink", " 被申请人应按约定还款"); + datas.put("rulingFollows", "被申请人依法偿还申请人欠款"); LocalDate now = LocalDate.now(); String year = Integer.toString(now.getYear()); datas.put("year", year);