SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev

Browse Source
This commit was merged in pull request #69.
This commit is contained in:
wangqiong123
2024-02-18 09:35:39 +08:00
committed by Gitea
parent 3add880d2f 11d33b80af
commit 584ddbe43d
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java
+7 -7
View File
@@ -425,18 +425,18 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
@Override @Override
public AjaxResult updateTemplate(TemplateManage templateManage) { public AjaxResult updateTemplate(TemplateManage templateManage) {
Long id = templateManage.getId(); Long id = templateManage.getId();
templateManage.setUpdateBy(getUsername()); templateManage.setUpdateBy(getUsername());
int i = templateManageMapper.updateTemplateManage(templateManage); int i = templateManageMapper.updateTemplateManage(templateManage);
// 先删除附件 // 先删除附件
if(CollectionUtil.isNotEmpty(templateManage.getAnnexIds())) { if (CollectionUtil.isNotEmpty(templateManage.getAnnexIds())) {
templateManageMapper.deleteTemplateManageFileById(id, templateManage.getAnnexIds()); templateManageMapper.deleteTemplateManageFileById(id, templateManage.getAnnexIds());
// 修改附件表 // 修改附件表
templateManageMapper.updateFileByIds(templateManage); templateManageMapper.updateFileByIds(templateManage);
} }
if (i > 0) { if (i > 0) {
return AjaxResult.success("修改成功"); return AjaxResult.success("修改成功");
} }
return AjaxResult.error(); return AjaxResult.error();
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
+1 -3
View File
@@ -308,9 +308,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
req.setTemplateType(TemplateTypeEnum.MEDIATION_APPLICATION.getCode()); req.setTemplateType(TemplateTypeEnum.MEDIATION_APPLICATION.getCode());
// todo 部署放开 // todo 部署放开
caseApplicationService.generateApplication(req); caseApplicationService.generateApplication(req);
// 保存案件附件 // 保存案件附件
if (CollectionUtil.isNotEmpty(caseAttachList)) { if (CollectionUtil.isNotEmpty(caseAttachList)) {
for (MsCaseAttach caseAttach : caseAttachList) { for (MsCaseAttach caseAttach : caseAttachList) {
caseAttach.setCaseAppliId(caseApplication.getId()); caseAttach.setCaseAppliId(caseApplication.getId());
@@ -1015,7 +1013,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
// 被申请人预约 // 被申请人预约
// 新增日志 // 新增日志
CaseLogUtils.insertCaseLog(vo.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "被申请人选择调解员"); CaseLogUtils.insertCaseLog(vo.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "被申请人选择调解员");
if (StrUtil.isEmpty(msCaseAffiliate.getContactTelphoneAgent())) { if (StrUtil.isEmpty(msCaseAffiliate.getContactTelphoneAgent())|| StrUtil.isEmpty(msCaseAffiliate.getApplicationPhone())) {
return AjaxResult.error("申请代理人手机号为空"); return AjaxResult.error("申请代理人手机号为空");
} }
// 判断申请人是否预约 // 判断申请人是否预约