From 04bbca97ae580d03bb876de594a11068e3204b5e Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Sat, 20 Jan 2024 19:09:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BD=92=E6=A1=A3=E9=80=81?= =?UTF-8?q?=E8=BE=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mscase/impl/MsSignSealServiceImpl.java | 58 ++++++++++--------- .../utils/FixSelectFlowDetailUtils.java | 4 +- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java index 97e9ea9..3968677 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java @@ -97,6 +97,8 @@ public class MsSignSealServiceImpl implements MsSignSealService { private SendMailRecordMapper sendMailRecordMapper; + + @Override @Transactional public AjaxResult sureMediationSeal(MsCaseApplicationVO caseApplicationVO) throws EsignDemoException, InterruptedException { @@ -550,37 +552,37 @@ public class MsSignSealServiceImpl implements MsSignSealService { boolean appEmailFlag = sendCaseEmail(caseApplication1, appEmail, caseAttachList); - SendMailRecord sendMailRecord = new SendMailRecord(); - sendMailRecord.setCaseId(id); - sendMailRecord.setMailAddress(appEmail); - sendMailRecord.setMailContent("您好，审核后的裁决书在附件中请查阅"); -// sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅"); - sendMailRecord.setMailName("签署后的裁决书"); - sendMailRecord.setSendTime(new Date()); - sendMailRecord.setCreateBy(getUsername()); - if (appEmailFlag) { - sendMailRecord.setSendStatus(1); - } else { - sendMailRecord.setSendStatus(0); - } - sendMailRecordMapper.saveSendMailRecord(sendMailRecord); +// SendMailRecord sendMailRecord = new SendMailRecord(); +// sendMailRecord.setCaseId(id); +// sendMailRecord.setMailAddress(appEmail); +// sendMailRecord.setMailContent("您好，审核后的裁决书在附件中请查阅"); +//// sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅"); +// sendMailRecord.setMailName("签署后的裁决书"); +// sendMailRecord.setSendTime(new Date()); +// sendMailRecord.setCreateBy(getUsername()); +// if (appEmailFlag) { +// sendMailRecord.setSendStatus(1); +// } else { +// sendMailRecord.setSendStatus(0); +// } +// sendMailRecordMapper.saveSendMailRecord(sendMailRecord); boolean resEmailFlag = sendCaseEmail(caseApplication1, resEmail, caseAttachList); - SendMailRecord sendMailRecord1 = new SendMailRecord(); - sendMailRecord1.setCaseId(id); - sendMailRecord1.setMailAddress(resEmail); -// sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅"); - sendMailRecord1.setMailContent("您好，审核后的裁决书在附件中请查阅"); - sendMailRecord1.setMailName("签署后的裁决书"); - sendMailRecord1.setSendTime(new Date()); - sendMailRecord1.setCreateBy(getUsername()); - if (resEmailFlag) { - sendMailRecord1.setSendStatus(1); - }else { - sendMailRecord1.setSendStatus(0); - } - sendMailRecordMapper.saveSendMailRecord(sendMailRecord1); +// SendMailRecord sendMailRecord1 = new SendMailRecord(); +// sendMailRecord1.setCaseId(id); +// sendMailRecord1.setMailAddress(resEmail); +//// sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅"); +// sendMailRecord1.setMailContent("您好，审核后的裁决书在附件中请查阅"); +// sendMailRecord1.setMailName("签署后的裁决书"); +// sendMailRecord1.setSendTime(new Date()); +// sendMailRecord1.setCreateBy(getUsername()); +// if (resEmailFlag) { +// sendMailRecord1.setSendStatus(1); +// }else { +// sendMailRecord1.setSendStatus(0); +// } +// sendMailRecordMapper.saveSendMailRecord(sendMailRecord1); if(!appEmailFlag&&!resEmailFlag){ throw new ServiceException("裁决书发送失败"); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java index 70e360d..56e4698 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java @@ -291,7 +291,7 @@ public class FixSelectFlowDetailUtils { MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(sealSignRecord.getCaseAppliId()); if ((mssealSignRecord.getSignFlowStatus() != null) && (mssealSignRecord.getSignFlowStatus().intValue() == 1)) { // 根据流程id查找下一个流程节点 - MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getId().intValue()); + MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue()); MsCaseApplication application = new MsCaseApplication(); application.setId(caseApplicationselect.getId()); application.setCaseFlowId(nextFlow.getId()); @@ -313,7 +313,7 @@ public class FixSelectFlowDetailUtils { sealSignRecordMapper.updateByPrimaryKeySelective(mssealSignRecord); // 根据流程id查找下一个流程节点 - MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getId().intValue()); + MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue()); MsCaseApplication application = new MsCaseApplication(); application.setId(caseApplicationselect.getId()); application.setCaseFlowId(nextFlow.getId()); -- 2.54.0