From abf30481b18ab559cc0de490a08c7e32abc29336 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Fri, 2 Feb 2024 15:22:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E8=A7=A3=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=9C=AA=E8=BE=BE=E6=88=90=E8=B0=83=E8=A7=A3=E4=BD=86?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E4=BA=89=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MsCaseApplicationServiceImpl.java | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java index eb54b36..6e4b946 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java @@ -1352,8 +1352,23 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { sealSignRecord.setPensonNameMedi(sysUser.getNickName()); } - sealSignRecord.setPensonAccount(caseAffiliate.getContactTelphoneAgent()); - sealSignRecord.setPensonName(caseAffiliate.getNameAgent()); + Integer organizeFlag = caseAffiliate.getOrganizeFlag(); + if(organizeFlag!=null){ + if(organizeFlag.intValue()==1){ + sealSignRecord.setPensonAccount(caseAffiliate.getContactTelphoneAgent()); + sealSignRecord.setPensonName(caseAffiliate.getNameAgent()); + }else { + String nameAgent = caseAffiliate.getNameAgent(); + if(StringUtils.isNotBlank(nameAgent)){ + sealSignRecord.setPensonAccount(caseAffiliate.getContactTelphoneAgent()); + sealSignRecord.setPensonName(caseAffiliate.getNameAgent()); + }else { + sealSignRecord.setPensonAccount(caseAffiliate.getApplicationPhone()); + sealSignRecord.setPensonName(caseAffiliate.getApplicationName()); + } + } + } + sealSignRecord.setPensonAccountRes(caseAffiliate.getRespondentPhone()); sealSignRecord.setPensonNameRes(caseAffiliate.getRespondentName()); @@ -1659,7 +1674,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { request1.setTemplateParamSet(new String[]{caseAffiliate.getRespondentName(), application.getCaseNum()}); Boolean aBoolean1 = SmsUtils.sendSms(request1); - // 修改案件状态为待签名 + // 修改案件状态为结束 Example flowExample = new Example(MsCaseFlow.class); flowExample.createCriteria().andEqualTo("caseStatusName", "结束"); MsCaseFlow caseFlow = caseFlowMapper.selectOneByExample(flowExample); @@ -1674,8 +1689,19 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { return AjaxResult.success(); }else if(mediaResult.intValue()==3){ //未达成调解但不再争议 + // 修改案件状态为结束 + Example flowExample = new Example(MsCaseFlow.class); + flowExample.createCriteria().andEqualTo("caseStatusName", "结束"); + MsCaseFlow caseFlow = caseFlowMapper.selectOneByExample(flowExample); + if(caseFlow != null){ + application.setCaseFlowId(caseFlow.getId()); + application.setCaseStatusName(caseFlow.getCaseStatusName()); + msCaseApplicationMapper.updateByPrimaryKey(application); + } - + application.setMediaResult(mediaResult); + msCaseApplicationMapper.updateByPrimaryKeySelective(application); + return AjaxResult.success(); }else if(mediaResult.intValue()==4){ //未达成调解但同意引入仲裁