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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java

@@ -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.MsSignSealDTO;
 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.mscase.MsCaseAffiliate;
 import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication;
@@ -639,37 +640,37 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                 resEmail = caseAffiliate.getRespondentEmail();
                 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(SecurityUtils.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(SecurityUtils.getUsername());
+                if (resEmailFlag) {
+                    sendMailRecord1.setSendStatus(1);
+                }else {
+                    sendMailRecord1.setSendStatus(0);
+                }
+                sendMailRecordMapper.saveSendMailRecord(sendMailRecord1);
                 if(!appEmailFlag&&!resEmailFlag){
                     throw new ServiceException("调解书发送失败");
                 }