SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'qtz' of SH-Arbitrate/Mediation-Backend into dev

Browse Source
This commit was merged in pull request #32.
This commit is contained in:
qtz
2024-01-20 19:13:12 +08:00
committed by Gitea
parent f2f47a6aa8 7600bf17c1
commit a55563bfe6
2 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java
+30 -28
View File
@@ -97,6 +97,8 @@ public class MsSignSealServiceImpl implements MsSignSealService {
private SendMailRecordMapper sendMailRecordMapper; private SendMailRecordMapper sendMailRecordMapper;
@Override @Override
@Transactional @Transactional
public AjaxResult sureMediationSeal(MsCaseApplicationVO caseApplicationVO) throws EsignDemoException, InterruptedException { public AjaxResult sureMediationSeal(MsCaseApplicationVO caseApplicationVO) throws EsignDemoException, InterruptedException {
@@ -550,37 +552,37 @@ public class MsSignSealServiceImpl implements MsSignSealService {
boolean appEmailFlag = sendCaseEmail(caseApplication1, appEmail, caseAttachList); boolean appEmailFlag = sendCaseEmail(caseApplication1, appEmail, caseAttachList);
SendMailRecord sendMailRecord = new SendMailRecord(); // SendMailRecord sendMailRecord = new SendMailRecord();
sendMailRecord.setCaseId(id); // sendMailRecord.setCaseId(id);
sendMailRecord.setMailAddress(appEmail); // sendMailRecord.setMailAddress(appEmail);
sendMailRecord.setMailContent("您好，审核后的裁决书在附件中请查阅"); // sendMailRecord.setMailContent("您好，审核后的裁决书在附件中请查阅");
// sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅"); //// sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅");
sendMailRecord.setMailName("签署后的裁决书"); // sendMailRecord.setMailName("签署后的裁决书");
sendMailRecord.setSendTime(new Date()); // sendMailRecord.setSendTime(new Date());
sendMailRecord.setCreateBy(getUsername()); // sendMailRecord.setCreateBy(getUsername());
if (appEmailFlag) { // if (appEmailFlag) {
sendMailRecord.setSendStatus(1); // sendMailRecord.setSendStatus(1);
} else { // } else {
sendMailRecord.setSendStatus(0); // sendMailRecord.setSendStatus(0);
} // }
sendMailRecordMapper.saveSendMailRecord(sendMailRecord); // sendMailRecordMapper.saveSendMailRecord(sendMailRecord);
boolean resEmailFlag = sendCaseEmail(caseApplication1, resEmail, caseAttachList); boolean resEmailFlag = sendCaseEmail(caseApplication1, resEmail, caseAttachList);
SendMailRecord sendMailRecord1 = new SendMailRecord(); // SendMailRecord sendMailRecord1 = new SendMailRecord();
sendMailRecord1.setCaseId(id); // sendMailRecord1.setCaseId(id);
sendMailRecord1.setMailAddress(resEmail); // sendMailRecord1.setMailAddress(resEmail);
// sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅"); //// sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅");
sendMailRecord1.setMailContent("您好，审核后的裁决书在附件中请查阅"); // sendMailRecord1.setMailContent("您好，审核后的裁决书在附件中请查阅");
sendMailRecord1.setMailName("签署后的裁决书"); // sendMailRecord1.setMailName("签署后的裁决书");
sendMailRecord1.setSendTime(new Date()); // sendMailRecord1.setSendTime(new Date());
sendMailRecord1.setCreateBy(getUsername()); // sendMailRecord1.setCreateBy(getUsername());
if (resEmailFlag) { // if (resEmailFlag) {
sendMailRecord1.setSendStatus(1); // sendMailRecord1.setSendStatus(1);
}else { // }else {
sendMailRecord1.setSendStatus(0); // sendMailRecord1.setSendStatus(0);
} // }
sendMailRecordMapper.saveSendMailRecord(sendMailRecord1); // sendMailRecordMapper.saveSendMailRecord(sendMailRecord1);
if(!appEmailFlag&&!resEmailFlag){ if(!appEmailFlag&&!resEmailFlag){
throw new ServiceException("裁决书发送失败"); throw new ServiceException("裁决书发送失败");
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java
+2 -2
View File
@@ -291,7 +291,7 @@ public class FixSelectFlowDetailUtils {
MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(sealSignRecord.getCaseAppliId()); MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(sealSignRecord.getCaseAppliId());
if ((mssealSignRecord.getSignFlowStatus() != null) && (mssealSignRecord.getSignFlowStatus().intValue() == 1)) { if ((mssealSignRecord.getSignFlowStatus() != null) && (mssealSignRecord.getSignFlowStatus().intValue() == 1)) {
// 根据流程id查找下一个流程节点 // 根据流程id查找下一个流程节点
MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getId().intValue()); MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue());
MsCaseApplication application = new MsCaseApplication(); MsCaseApplication application = new MsCaseApplication();
application.setId(caseApplicationselect.getId()); application.setId(caseApplicationselect.getId());
application.setCaseFlowId(nextFlow.getId()); application.setCaseFlowId(nextFlow.getId());
@@ -313,7 +313,7 @@ public class FixSelectFlowDetailUtils {
sealSignRecordMapper.updateByPrimaryKeySelective(mssealSignRecord); sealSignRecordMapper.updateByPrimaryKeySelective(mssealSignRecord);
// 根据流程id查找下一个流程节点 // 根据流程id查找下一个流程节点
MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getId().intValue()); MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue());
MsCaseApplication application = new MsCaseApplication(); MsCaseApplication application = new MsCaseApplication();
application.setId(caseApplicationselect.getId()); application.setId(caseApplicationselect.getId());
application.setCaseFlowId(nextFlow.getId()); application.setCaseFlowId(nextFlow.getId());