From 9eae44bc8944320d4234a9e5d2c89df5537ea4d9 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Tue, 19 Sep 2023 21:09:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E5=BA=AD=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 13 ++- .../wisdomarbitrate/domain/Arbitrator.java | 12 +++ .../domain/CaseApplication.java | 31 +++++++ .../service/ICaseApplicationService.java | 2 + .../impl/CaseApplicationServiceImpl.java | 87 +++++++++++++++++-- .../wisdomarbitrate/ArbitratorMapper.xml | 8 ++ .../wisdomarbitrate/CaseApplicationMapper.xml | 14 ++- 7 files changed, 159 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index b453609..e302f4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -141,13 +141,24 @@ public class CaseApplicationController extends BaseController { * 组庭审核 */ @PreAuthorize("@ss.hasPermi('caseApplication:pendTralCheck')") - @Log(title = "组庭", businessType = BusinessType.UPDATE) + @Log(title = "组庭审核", businessType = BusinessType.UPDATE) @PostMapping("/pendTralCheck") public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) { return toAjax(caseApplicationService.pendTralCheck(caseApplication)); } + /** + * 组庭确认 + */ + @PreAuthorize("@ss.hasPermi('caseApplication:pendTralSure')") + @Log(title = "组庭确认", businessType = BusinessType.UPDATE) + @PostMapping("/pendTralSure") + public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication) + { + return toAjax(caseApplicationService.pendTralSure(caseApplication)); + } + /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Arbitrator.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Arbitrator.java index b35d5aa..4e73c8d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Arbitrator.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Arbitrator.java @@ -2,6 +2,8 @@ package com.ruoyi.wisdomarbitrate.domain; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.List; + public class Arbitrator extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,6 +24,16 @@ public class Arbitrator extends BaseEntity { /** 联系电话 */ private String telephone; + List idList; + + public List getIdList() { + return idList; + } + + public void setIdList(List idList) { + this.idList = idList; + } + public String getArbitratorName() { return arbitratorName; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index c054427..cef3dd4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -80,6 +80,37 @@ public class CaseApplication extends BaseEntity { private int objectionAddEviden; /** 是否需要开庭审理 */ private int openCourtHear; + /** 案件状态名称 */ + private String caseStatusName; + + public String getCaseStatusName() { + return caseStatusName; + } + + public void setCaseStatusName(String caseStatusName) { + this.caseStatusName = caseStatusName; + } + + /** 申请人名称 */ + private String applicantName; + /** 被申请人名称 */ + private String respondentName; + + public String getApplicantName() { + return applicantName; + } + + public void setApplicantName(String applicantName) { + this.applicantName = applicantName; + } + + public String getRespondentName() { + return respondentName; + } + + public void setRespondentName(String respondentName) { + this.respondentName = respondentName; + } public int getObjectionAddEviden() { return objectionAddEviden; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java index b12c392..c6e6795 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java @@ -27,4 +27,6 @@ public interface ICaseApplicationService { int pendingAppointArbotrar(CaseApplication caseApplication); int pendTralCheck(CaseApplication caseApplication); + + int pendTralSure(CaseApplication caseApplication); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index ce875ac..9ee54f9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -2,11 +2,14 @@ package com.ruoyi.wisdomarbitrate.service.impl; import com.ruoyi.common.constant.CaseApplicationConstants; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SmsUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.wisdomarbitrate.domain.Arbitrator; import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import com.ruoyi.wisdomarbitrate.mapper.ArbitratorMapper; import com.ruoyi.wisdomarbitrate.mapper.CaseAffiliateMapper; import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper; import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService; @@ -15,10 +18,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.TreeSet; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; import static com.ruoyi.common.core.domain.AjaxResult.error; @@ -33,6 +34,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Autowired private CaseAffiliateMapper caseAffiliateMapper; + @Autowired + private ArbitratorMapper arbitratorMapper; + @Override public List selectCaseApplicationList(CaseApplication caseApplication) { @@ -99,7 +103,20 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { CaseAffiliate caseAffiliate = new CaseAffiliate(); caseAffiliate.setCaseAppliId(caseApplication.getId()); List caseAffiliatListeselect = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate); - if(caseApplicationselect!=null){ + if(caseAffiliatListeselect!=null){ + StringBuffer applicantName = new StringBuffer(); + StringBuffer respondentName = new StringBuffer(); + for (int i = 0; i < caseAffiliatListeselect.size(); i++){ + CaseAffiliate caseAffiliateselect = caseAffiliatListeselect.get(i); + int identityType = caseAffiliateselect.getIdentityType(); + if(identityType==1){ + applicantName.append(caseAffiliateselect.getName()).append(",");; + }else if(identityType==2){ + respondentName.append(caseAffiliateselect.getName()).append(",");; + } + } + caseApplicationselect.setApplicantName(applicantName.toString()); + caseApplicationselect.setRespondentName(respondentName.toString()); caseApplicationselect.setCaseAffiliates(caseAffiliatListeselect); } return caseApplicationselect; @@ -231,6 +248,66 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { return rows; } + @Override + @Transactional + public int pendTralSure(CaseApplication caseApplication) { + caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); + int rows = caseApplicationMapper.submitCaseApplication(caseApplication); + + //发送短信通知 + SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest(); + request.setTemplateId("1931000"); + + CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication); + String caseNum = caseApplicationselect.getCaseNum(); + Date hearDate = caseApplicationselect.getHearDate(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String hearDatestr = dateFormat.format(hearDate); + + String arbitratorId = caseApplicationselect.getArbitratorId(); + List arbitratorList = new ArrayList<>(); + if(StringUtils.isNotEmpty(arbitratorId)){ + String[] idStrList = arbitratorId.split(","); + List idList = new ArrayList<>(); + for(int i = 0;i < idStrList.length;i ++ ){ + idList.add(Long.parseLong(idStrList[i])); + } + Arbitrator arbitrator = new Arbitrator(); + arbitrator.setIdList(idList); + arbitratorList = arbitratorMapper.selectArbitratorList(arbitrator); + if(arbitratorList!=null) { + for (int i = 0; i < arbitratorList.size(); i++) { + Arbitrator arbitratorselect = arbitratorList.get(i); + //给仲裁员发送短信通知 + request.setPhone(arbitratorselect.getTelephone()); + // 1931000 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。 + String name = arbitratorselect.getArbitratorName(); + request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr}); + SmsUtils.sendSms(request); + } + } + } + + CaseAffiliate caseAffiliate = new CaseAffiliate(); + caseAffiliate.setCaseAppliId(caseApplication.getId()); + List caseAffiliatListeselect = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate); + if(caseAffiliatListeselect!=null) { + for (int j = 0; j < caseAffiliatListeselect.size(); j++) { + CaseAffiliate caseAffiliateselect = caseAffiliatListeselect.get(j); + int identityType = caseAffiliateselect.getIdentityType(); + //给申请人、被申请人发送短信通知 + request.setPhone(caseAffiliateselect.getContactTelphone()); + // 1931000 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。 + String name = caseAffiliateselect.getName(); + request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr}); + SmsUtils.sendSms(request); + } + } + + return rows; + + } + @Override @Transactional public int pendingAppointArbotrar(CaseApplication caseApplication) { diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitratorMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitratorMapper.xml index d184338..d88164e 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitratorMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitratorMapper.xml @@ -26,6 +26,14 @@ AND a.arbitrator_name like concat('%', #{arbitratorName}, '%') + + + AND a.id in + + #{id} + + + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 4ba5adb..ec844ec 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -24,7 +24,7 @@ - + @@ -34,7 +34,16 @@ + SELECT a.id ,a.case_appli_id ,a.eviden_determi ,a.fact_determi ,a.case_sketch ,a.arbitrate_think ,a.ruling_follows , + a.verifica_opinion ,a.check_opinion + from arbitrate_record a + + + AND a.case_appli_id = #{caseAppliId} + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index ec844ec..cd64524 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -20,7 +20,6 @@ - @@ -45,7 +44,7 @@ END caseStatusName, 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.paid_expenses ,c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time , + c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time , c.update_by ,c.update_time from case_application c @@ -84,7 +83,6 @@ claim_interest_owed, claim_liquid_damag, fee_payable, - paid_expenses, begin_video_date, online_video_person, @@ -130,7 +128,6 @@ claim_interest_owed = #{claimInterestOwed}, claim_liquid_damag = #{claimLiquidDamag}, fee_payable = #{feePayable}, - paid_expenses = #{paidExpenses}, begin_video_date = #{beginVideoDate}, online_video_person = #{onlineVideoPerson}, @@ -173,7 +170,7 @@