From 3ac814358901df1bc7af07028b353cea4918ec24 Mon Sep 17 00:00:00 2001 From: hejinbo Date: Sat, 30 Sep 2023 14:00:07 +0800 Subject: [PATCH] =?UTF-8?q?9.30=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdjudicationController.java | 7 +++- .../service/IAdjudicationService.java | 2 +- .../service/impl/AdjudicationServiceImpl.java | 37 +++++++++++++++---- .../wisdomarbitrate/CaseAffiliateMapper.xml | 5 ++- .../wisdomarbitrate/CaseApplicationMapper.xml | 2 +- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java index 024a64e..0c3b451 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java @@ -29,11 +29,14 @@ public class AdjudicationController extends BaseController { * @param id 案件id * @param appEmail 申请人邮箱 * @param resEmail 被申请人邮箱 + * @param apptrackingNum 申请人快递单号 + * @param restrackingNum 被申请人快递单号 * @return */ @PostMapping("/delivery") - public AjaxResult sendDocumentByEmail(Long id,String appEmail,String resEmail){ - return adjudicationService.sendDocumentByEmail(id,appEmail,resEmail); + public AjaxResult sendDocumentByEmail(Long id,String appEmail,String resEmail + ,String apptrackingNum,String restrackingNum){ + return adjudicationService.sendDocumentByEmail(id,appEmail,resEmail,apptrackingNum,restrackingNum); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java index 675cc72..416e92c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java @@ -6,7 +6,7 @@ import com.ruoyi.wisdomarbitrate.domain.CaseApplication; public interface IAdjudicationService { AjaxResult createDocument(CaseApplication caseApplication); - AjaxResult sendDocumentByEmail(Long id,String appEmail,String resEmail); + AjaxResult sendDocumentByEmail(Long id,String appEmail,String resEmail ,String apptrackingNum,String restrackingNum); AjaxResult getLogisticsInfo(String trackingNum,Integer phoneLastFour); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 4b4b4c0..9fff3eb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.MailSendException; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.*; import java.net.HttpURLConnection; @@ -125,10 +126,10 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("year", now.getYear()); datas.put("months", now.getMonthValue()); datas.put("day", now.getDayOfMonth()); - //String modalFilePath = "/data/arbitrate-document/template/仲裁裁决书模板.docx"; - String modalFilePath = "D:/develop/仲裁裁决书模板 (2).docx"; - //String saveFolderPath = "/data/arbitrate-document/formal/" + now.getYear() + "/" + now.getMonthValue() + "/" + now.getDayOfMonth(); - String saveFolderPath = "D:/data/" + now.getYear() + "/" + now.getMonthValue() + "/" + now.getDayOfMonth(); + String modalFilePath = "/data/arbitrate-document/template/仲裁裁决书模板.docx"; + //String modalFilePath = "D:/develop/仲裁裁决书模板 (2).docx"; + String saveFolderPath = "/data/arbitrate-document/formal/" + now.getYear() + "/" + now.getMonthValue() + "/" + now.getDayOfMonth(); + //String saveFolderPath = "D:/data/" + now.getYear() + "/" + now.getMonthValue() + "/" + now.getDayOfMonth(); String fileName = UUID.randomUUID().toString().replace("-", "") + ".docx"; String resultFilePath = saveFolderPath + "/" + fileName; // 创建日期目录 @@ -167,7 +168,8 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } @Override - public AjaxResult sendDocumentByEmail(Long id, String appEmail, String resEmail) { + @Transactional + public AjaxResult sendDocumentByEmail(Long id, String appEmail, String resEmail ,String apptrackingNum,String restrackingNum) { CaseApplication caseApplication = new CaseApplication(); caseApplication.setId(id); CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); @@ -187,19 +189,40 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } } } + if (fileList.size()<1){ + return AjaxResult.error("未查询到裁决书"); + } + File file = fileList.get(0); //电子邮件送达 JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender(); if (appEmail != null) { - emailOutUtil.sendMessageCarryFiles(appEmail, "案件裁决书", "您的裁决书已送达,详情请查阅附件", fileList + emailOutUtil.sendMessageCarryFile(appEmail, "案件裁决书", "您的裁决书已送达,详情请查阅附件", file , "hjbjava@163.com", javaMailSender); } if (resEmail != null) { - emailOutUtil.sendMessageCarryFiles(resEmail, "案件裁决书", "您的裁决书已送达,详情请查阅附件", fileList + emailOutUtil.sendMessageCarryFile(resEmail, "案件裁决书", "您的裁决书已送达,详情请查阅附件", file , "hjbjava@163.com", javaMailSender); } //修改案件状态 caseApplication1.setCaseStatus(CaseApplicationConstants.CASE_FILING); caseApplicationMapper.submitCaseApplication(caseApplication1); + //保存邮箱信息和快递单号到关联人表 + CaseAffiliate caseAffiliate = new CaseAffiliate(); + caseAffiliate.setCaseAppliId(id); + List caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate); + if (caseAffiliates!=null&&caseAffiliates.size()>0){ + for (CaseAffiliate affiliate : caseAffiliates) { + if (affiliate.getIdentityType() == 1){ //申请人 + affiliate.setSendEmail(appEmail); + affiliate.setTrackNum(apptrackingNum); + caseAffiliateMapper.updataCaseAffiliate(affiliate); + }else { + affiliate.setSendEmail(resEmail); + affiliate.setTrackNum(restrackingNum); + caseAffiliateMapper.updataCaseAffiliate(affiliate); + } + } + } return AjaxResult.success("仲裁文书送达成功"); } catch (MailSendException e) { return AjaxResult.error("发送失败,请检查文件路径"); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml index c1a9fd0..974b9f6 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml @@ -60,7 +60,10 @@ name_agent = #{nameAgent}, identity_num_agent = #{identityNumAgent}, contact_telphone_agent = #{contactTelphoneAgent}, - contact_address_agent = #{contactAddressAgent} + contact_address_agent = #{contactAddressAgent}, + send_email = #{sendEmail}, + track_num = #{trackNum} + where id = #{id} diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index f847b20..3875dca 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -55,7 +55,7 @@ c.hear_date ,c.arbitrat_claims , c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable , c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time , - c.update_by ,c.update_time + c.update_by ,c.update_time , c.arbitrator_name from case_application c