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

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

Browse Source
This commit was merged in pull request #83.
This commit is contained in:
qtz
2024-02-21 09:42:24 +08:00
committed by Gitea
parent 5c0439f1f0 f595820ec4
commit 8e54eba40a
1 changed files with 29 additions and 28 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
+29 -28
View File
@@ -33,6 +33,7 @@ import com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage;
import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord;
import com.ruoyi.wisdomarbitrate.domain.dto.mscase.MsSignSealDTO; import com.ruoyi.wisdomarbitrate.domain.dto.mscase.MsSignSealDTO;
import com.ruoyi.wisdomarbitrate.domain.dto.mscase.SealSignRecord; import com.ruoyi.wisdomarbitrate.domain.dto.mscase.SealSignRecord;
import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SendMailRecord;
import com.ruoyi.wisdomarbitrate.domain.entity.dept.MsSealSignRecord; import com.ruoyi.wisdomarbitrate.domain.entity.dept.MsSealSignRecord;
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate; import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate;
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication; import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication;
@@ -639,37 +640,37 @@ public class MsSignSealServiceImpl implements MsSignSealService {
resEmail = caseAffiliate.getRespondentEmail(); resEmail = caseAffiliate.getRespondentEmail();
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(SecurityUtils.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(SecurityUtils.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("调解书发送失败");
} }