From d4871f4a2fb9c69dd5568bdbb0cc84bf7af09fde Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 23 Oct 2023 15:10:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BB=B2=E8=A3=81?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA=E5=8D=95=E4=B8=AA=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseArbitrateController.java | 12 +- .../service/ICaseArbitrateService.java | 2 +- .../impl/CaseArbitrateServiceImpl.java | 143 ++++++++++-------- .../wisdomarbitrate/CaseApplicationMapper.xml | 4 +- 4 files changed, 85 insertions(+), 76 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java index 9f09e90..1e1a035 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java @@ -22,17 +22,15 @@ public class CaseArbitrateController extends BaseController { /** * 审核仲裁方式 - * @param batchCaseApplication - * @param batchCaseApplication 1同意，0拒绝 + * @param caseApplication + * @param opinion 1同意，0拒绝 * @return */ @PutMapping("/method") // @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')") - public AjaxResult examineArbitrateMethod(@RequestBody BatchCaseApplication batchCaseApplication){ - if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getOpinion()==null){ - return error("参数校验失败"); - } - return caseArbitrateService.examineArbitrateMethod(batchCaseApplication.getIds(),batchCaseApplication.getOpinion()); + public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication + , Integer opinion){ + return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java index da878c0..3437922 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java @@ -12,5 +12,5 @@ public interface ICaseArbitrateService { AjaxResult writtenHear(ArbitrateRecord arbitrateRecord); - AjaxResult examineArbitrateMethod(List ids, Integer opinion); + AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java index 13a4d71..657d7fa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java @@ -39,75 +39,86 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { @Override @Transactional - public AjaxResult examineArbitrateMethod(List ids, Integer opinion) { - // 批量查询案件信息组装成map - List caseApplicationList = caseApplicationMapper.listCaseApplicationByIds(ids); - if (CollectionUtil.isEmpty(caseApplicationList)) { + public AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion) { + //查询案件详细信息 + CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); + if (caseApplication1 == null) { return AjaxResult.success(); } - Map caseApplicationMap = caseApplicationList.stream().collect(Collectors.toMap(CaseApplication::getId, Function.identity(), (n1, n2) -> n2)); - - //发送短信通知 - SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest(); - - for (Long id : ids) { - - CaseApplication caseApplication = new CaseApplication(); - caseApplication.setId(id); - //查询案件详细信息 - CaseApplication caseApplicationById = caseApplicationMap.get(id); - if (caseApplicationById == null) { - continue; - } - // 获取该案件仲裁方式 - Integer arbitratMethod = caseApplicationById.getArbitratMethod(); - if(arbitratMethod!=null) { - String caseNum = caseApplicationById.getCaseNum(); - // 日志节点的状态 - int caseLogStatus; - if (opinion == 0) { //拒绝 - if (arbitratMethod == 2) { - caseApplicationById.setArbitratMethod(1); // 更改仲裁方式 - //修改案件状态为待开庭审理 -// caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); - //修改案件状态为待修改开庭时间 - caseApplicationById.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); - // 新增日志 - caseLogStatus = CaseApplicationConstants.MODIFY_HEARDATE; - - } else { - caseApplicationById.setArbitratMethod(2); - //修改案件状态为待书面审理 - caseApplicationById.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR); - caseLogStatus = CaseApplicationConstants.PENDING_WRIITEN_HEAR; - - } - } else { - if (arbitratMethod == 2) { - //修改案件状态为待书面审理 - caseApplicationById.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR); - caseLogStatus = CaseApplicationConstants.PENDING_WRIITEN_HEAR; - - } else { - //修改案件状态为待开庭审理 -// caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); - //修改案件状态为待修改开庭时间 - caseApplicationById.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); - caseLogStatus = CaseApplicationConstants.MODIFY_HEARDATE; - - - } - } - // 更改案件状态 - int i = caseApplicationMapper.submitCaseApplication(caseApplicationById); - if (i > 0) { - // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(), caseLogStatus, ""); - // 发送短信 - sendArbitratMethodMes(caseApplicationById, request, caseNum); - } - } + Integer arbitratMethod = caseApplication1.getArbitratMethod(); + if(arbitratMethod==null) { + return AjaxResult.error("请先指定仲裁方式"); } + String caseNum = caseApplication1.getCaseNum(); + if (opinion == 0) { //拒绝 + if (arbitratMethod == 2) { + caseApplication1.setArbitratMethod(1); // 更改仲裁方式 + //修改案件状态为待开庭审理 +// caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + //修改案件状态为待修改开庭时间 + caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); + // 新增日志 + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, ""); + + } else { + caseApplication1.setArbitratMethod(2); + //修改案件状态为待书面审理 + caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR); + // 新增日志 + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, ""); + + } + } else { + if (arbitratMethod == 2) { + //修改案件状态为待书面审理 + caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR); + // 新增日志 + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, ""); + + } else { + //修改案件状态为待开庭审理 +// caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + //修改案件状态为待修改开庭时间 + caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); + // 新增日志 + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, ""); + + } + } + int i = caseApplicationMapper.submitCaseApplication(caseApplication1); + if (i > 0) { + String arbitratMethodStr = caseApplication1.getArbitratMethod() == 1 ? "开庭审理" : "书面审理"; + //发送短信通知 + SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest(); + + CaseAffiliate caseAffiliate = new CaseAffiliate(); + caseAffiliate.setCaseAppliId(caseApplication1.getId()); + List caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate); //获取案件关联人信息 + if (caseAffiliates != null && caseAffiliates.size() > 0) { + for (CaseAffiliate affiliate : caseAffiliates) { + //获取身份类型 + int identityType = affiliate.getIdentityType(); + if (identityType == 1) { //申请人 + request.setTemplateId("1931000"); + request.setPhone(affiliate.getContactTelphone()); + // 这个值，要看你的模板中是否预留了占位符，如果没有则不需要设置 + // 1931000 普通短信 确定仲裁方式通知 尊敬的{1}用户，您的{2}仲裁案件，仲裁方式已确定为{3}，请知晓，如非本人操作，请忽略本短信。 + String name = affiliate.getName(); + request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr}); + SmsUtils.sendSms(request); + } else { //被申请人 + request.setTemplateId("1928006"); + request.setPhone(affiliate.getContactTelphone()); + // 模板id1928006 普通短信 案件应诉通知 尊敬的{1}用户，您的{2}案件{3}已成功受理，请点击https://phmapp.xayunmei.com选择是否应诉。 + String name = affiliate.getName(); + request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr}); + SmsUtils.sendSms(request); + } + } + } + + return AjaxResult.success("审核成功"); + } return AjaxResult.success(); } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index fb2f1d0..bb4440c 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -111,7 +111,7 @@ - or (t.identity_type=1 and t.case_status in (1,5,11,15,16,17) + or (t.identity_type=1 and t.case_status in (1,5,11,15,16,17,31) and t.application_organ_id in #{item} @@ -198,7 +198,7 @@ - or (t.identity_type=1 and t.case_status in (1,5,11,15,16,17) + or (t.identity_type=1 and t.case_status in (1,5,11,15,16,17,31) and t.application_organ_id in #{item} From 723440a37ea84234014d8d2d700880b98068d241 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 23 Oct 2023 16:08:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BC=80=E5=BA=AD=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java | 1 + .../resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java index 4f01e8a..a3c46a1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java @@ -29,4 +29,5 @@ public class ToDoCount { private int caseApplyAwardSend; // 待仲裁文书送达 private int caseApplyStored; // 待案件归档 private int caseApplyArchived; // 已归档 + private int updateOnlineHearDate; // 待修改开庭时间 } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index bb4440c..a17b294 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -160,7 +160,8 @@ sum( case when t1.case_status=14 then 1 else 0 end) caseApplyAwardSeal, sum( case when t1.case_status=15 then 1 else 0 end) caseApplyAwardSend, sum( case when t1.case_status=16 then 1 else 0 end) caseApplyStored, - sum( case when t1.case_status=17 then 1 else 0 end) caseApplyArchived + sum( case when t1.case_status=17 then 1 else 0 end) caseApplyArchived, + sum( case when t1.case_status=31 then 1 else 0 end) updateOnlineHearDate from( select DISTINCT(t.id),t.case_status,t.application_organ_id, t.arbitrator_id,t.identity_num , t.identity_type from( select c.id ,