From 76b430c7b5bab2a35cd74dcd03ded7ffb1c1f9f1 Mon Sep 17 00:00:00 2001
From: qitz <18810291185@163.com>
Date: Mon, 19 Feb 2024 09:21:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=81=E8=BE=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mscase/MsSignSealController.java          |  1 +
 .../service/mscase/MsSignSealService.java     |  1 +
 .../mscase/impl/MsSignSealServiceImpl.java    | 28 ++++++++++++-------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsSignSealController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsSignSealController.java
index 69098d0..9e735f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsSignSealController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsSignSealController.java
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.IOException;
 import java.util.List;
 
 @RestController
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsSignSealService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsSignSealService.java
index 8ed426d..9b790db 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsSignSealService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsSignSealService.java
@@ -7,6 +7,7 @@ import com.ruoyi.wisdomarbitrate.domain.dto.mscase.SealSignRecord;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseLogRecordVO;
 
+import java.io.IOException;
 import java.util.List;
 
 public interface MsSignSealService {
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 9eb0e71..81ffeaf 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
@@ -59,6 +59,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.io.IOException;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -522,8 +523,8 @@ public class MsSignSealServiceImpl implements MsSignSealService {
     }
 
     @Override
-    @Transactional
-    public AjaxResult msCaseFile(List<Long> ids) {
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult msCaseFile(List<Long> ids){
         try {
             for (Long id : ids) {
                 MsCaseApplication caseApplication1 = msCaseApplicationMapper.selectByPrimaryKey(id);
@@ -615,9 +616,16 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                 String appEmail = "";
                 String resEmail = "";
                 MsCaseAffiliate caseAffiliate = msCaseAffiliateMapper.selectByPrimaryKey(id);
-                appEmail = caseAffiliate.getAgentEmail();
-                resEmail = caseAffiliate.getRespondentEmail();
 
+                Integer organizeFlag = caseAffiliate.getOrganizeFlag();
+                if(organizeFlag!=null){
+                    if(organizeFlag.intValue()==1){
+                        appEmail = caseAffiliate.getAgentEmail();
+                    }else {
+                        appEmail = caseAffiliate.getApplicationEmail();
+                    }
+                }
+                resEmail = caseAffiliate.getRespondentEmail();
                 boolean appEmailFlag = sendCaseEmail(caseApplication1, appEmail, caseAttachList);
 
 //                SendMailRecord sendMailRecord = new SendMailRecord();
@@ -652,20 +660,20 @@ public class MsSignSealServiceImpl implements MsSignSealService {
 //                }
 //                sendMailRecordMapper.saveSendMailRecord(sendMailRecord1);
                 if(!appEmailFlag&&!resEmailFlag){
-                    throw new ServiceException("裁决书发送失败");
+                    throw new ServiceException("调解书发送失败");
                 }
                 if(!appEmailFlag){
-                    throw new ServiceException("申请人裁决书发送失败");
+                    throw new ServiceException("申请人调解书发送失败");
                 }
                 if(!resEmailFlag){
-                    throw new ServiceException("被申请人裁决书发送失败");
+                    throw new ServiceException("被申请人调解书发送失败");
                 }
-
                 CaseLogUtils.insertCaseLog(caseApplication1.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"归档");
 
             }
+
         } catch (Exception e) {
-            return AjaxResult.error(e.getMessage());
+            throw new ServiceException("调解书发送失败");
         }
 
         return AjaxResult.success("归档成功");
@@ -926,7 +934,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
 
         if (file != null && file.exists()) {
             try {
-                Boolean aBoolean = emailOutUtil.sendEmil(email, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null);
+                Boolean aBoolean = emailOutUtil.sendEmil(email, "您好，审核后的调解书在附件中请查阅", "签署后的调解书", fileList, null);
 
                 if (aBoolean) {
                     return Boolean.TRUE;