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 b22b2c2..5584dad 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 @@ -1043,6 +1043,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { // 申请人预约,需要查询被申请人是否预约,identity_type不为空 criteria.andEqualTo("type", MediatorTypeEnum.MI_NI_PROGRESS.getCode()); }else { + // todo PC端被申请人选择调解员时,未存到预约表,导致节点状态未改变 // 被申请人预约,需要查询申请人是否预约,identity_type为空 criteria.andEqualTo("type", MediatorTypeEnum.PC.getCode()); } @@ -1280,6 +1281,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { req.setTemplateType(TemplateTypeEnum.MEDIATE_BOOK.getCode()); AjaxResult result = generateApplication(req); if (result != null && result.isSuccess()) { + // todo 生成完调解书需要记录日志 List caseAttachList = msCaseAttachMapper.queryAnnexPathByCaseId(req.getId()); if (caseAttachList != null && caseAttachList.size() > 0) { for (MsCaseAttach caseAttach : caseAttachList) { @@ -2525,7 +2527,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { String saveFolderPath = RuoYiConfig.getUploadPath()+"/"+ year + "/" + month + "/" + day; Integer annexType = AnnexTypeEnum.MEDIATION_APPLICATION.getCode(); String orgFileName = "调解申请书"; - if(templateType!=null&&templateType==1) { + if(templateType!=null&&templateType==3) { orgFileName = "调解书"; annexType=AnnexTypeEnum.MEDIATE_BOOK.getCode(); } @@ -2542,15 +2544,10 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { .build(); //保存到附件表里,先删除之前的在保存 msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseAttach.getCaseAppliId(), AnnexTypeEnum.MEDIATION_APPLICATION.getCode()); - if (templateType!=null&&templateType==1) { + if (templateType!=null&&templateType==3) { msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseAttach.getCaseAppliId(), AnnexTypeEnum.MEDIATE_BOOK.getCode()); } msCaseAttachMapper.save(caseAttach); - // 生成调解书成功,需要更新流程节点 - //if (templateType!=null&&templateType==1) { - // caseApplicationService.nextFlow(application.getId(), application.getCaseFlowId(), application.getLockStatus()); - // todo 发送短信 - //} } /** 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..fe2011f 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 @@ -27,7 +27,6 @@ import com.ruoyi.common.utils.file.SaaSAPIFileUtils; import com.ruoyi.system.domain.entity.flow.MsCaseFlow; import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.mapper.flow.MsCaseFlowMapper; -import com.ruoyi.system.service.ISysUserService; import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify; import com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage; import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; @@ -652,13 +651,13 @@ 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(),"归档"); @@ -926,7 +925,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; diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateManageMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateManageMapper.xml index 8ce7597..9014322 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateManageMapper.xml @@ -138,7 +138,7 @@