diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ApprovalInfoMapper.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ApprovalInfoMapper.java index 1b46994e..1cd079ba 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ApprovalInfoMapper.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ApprovalInfoMapper.java @@ -20,6 +20,14 @@ public interface ApprovalInfoMapper */ public int insertApproval(ApprovalRequest approvalRequest); + /** + * 新增参数配置 + * + * @param id id + * @return 结果 + */ + public ApprovalRequest queryById(@Param("id") Long id); + public int updateApproval(ApprovalRequest approvalRequest); List selectMyApplyList(@Param("applicantId") Long userid, @Param("status") Integer status); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java index c614e873..746cd860 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java @@ -48,35 +48,36 @@ public class ApprovalServiceImpl implements ApprovalService { @Override public void approve(ApprovalRequest approval) { - approval.setStatus(ApprovalStatus.APPROVED.getCode()); + ApprovalRequest info = approvalInfoMapper.queryById(approval.getId()); + String contentTemplate="{}发布的{}\"{}\"{}审核已通过"; + String contentFormat = StrUtil.format(contentTemplate,info.getApplicantName(),ApprovalType.getDescription(info.getType()) + ,getModelNameByType(info.getContent(),info.getType())); + approval.setTitle(contentFormat); //更改审批单状态 + approval.setStatus(ApprovalStatus.APPROVED.getCode()); approvalInfoMapper.updateApproval(approval); //推送消息给申请人 NewSysNotificationParamsVo newSysNotificationParamsVo = new NewSysNotificationParamsVo(); String applyContentTemplate="发布的{}\"{}\"{}审核已通过"; - String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(approval.getType()) - ,getModelNameByType(approval.getContent(),approval.getType())); + String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(info.getType()) + ,getModelNameByType(info.getContent(),info.getType())); newSysNotificationParamsVo.setType(2); - newSysNotificationParamsVo.setSender(approval.getApplicantId()); - newSysNotificationParamsVo.setNotification_url(approval.getUrl()); - newSysNotificationParamsVo.setReceivers(approval.getApproverId().toString()); + newSysNotificationParamsVo.setSender(info.getApplicantId()); + newSysNotificationParamsVo.setNotification_url(info.getUrl()); + newSysNotificationParamsVo.setReceivers(info.getApproverId().toString()); newSysNotificationParamsVo.setContent(appContentFormat); infoPublishService.pushSysInfo(newSysNotificationParamsVo); //推送消息给审批人 NewSysNotificationParamsVo approveParamsVo = new NewSysNotificationParamsVo(); - String contentTemplate="{}发布的{}\"{}\"{}审核已通过"; - String contentFormat = StrUtil.format(contentTemplate,approval.getApplicantName(),ApprovalType.getDescription(approval.getType()) - ,getModelNameByType(approval.getContent(),approval.getType())); - approveParamsVo.setType(2); approveParamsVo.setContent(contentFormat); - approveParamsVo.setSender(approval.getApproverId()); - approveParamsVo.setNotification_url(approval.getUrl()); - approveParamsVo.setReceivers(approval.getApplicantId().toString()); + approveParamsVo.setSender(info.getApproverId()); + approveParamsVo.setNotification_url(info.getUrl()); + approveParamsVo.setReceivers(info.getApplicantId().toString()); infoPublishService.pushSysInfo(newSysNotificationParamsVo); //审批通过,更改状态 @@ -85,35 +86,37 @@ public class ApprovalServiceImpl implements ApprovalService { @Override public void reject(ApprovalRequest approval) { - approval.setStatus(ApprovalStatus.APPROVED.getCode()); + ApprovalRequest info = approvalInfoMapper.queryById(approval.getId()); + + String contentTemplate="{}发布的{}\"{}\"{}审核未通过"; + String contentFormat = StrUtil.format(contentTemplate,info.getApplicantName(),ApprovalType.getDescription(info.getType()) + ,getModelNameByType(info.getContent(),info.getType())); + approval.setTitle(contentFormat); //更改审批单状态 + approval.setStatus(ApprovalStatus.APPROVED.getCode()); approvalInfoMapper.updateApproval(approval); //推送消息给申请人 NewSysNotificationParamsVo newSysNotificationParamsVo = new NewSysNotificationParamsVo(); String applyContentTemplate="发布的{}\"{}\"{}审核未通过"; - String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(approval.getType()) - ,getModelNameByType(approval.getContent(),approval.getType())); + String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(info.getType()) + ,getModelNameByType(info.getContent(),info.getType())); newSysNotificationParamsVo.setType(2); - newSysNotificationParamsVo.setSender(approval.getApplicantId()); - newSysNotificationParamsVo.setNotification_url(approval.getUrl()); - newSysNotificationParamsVo.setReceivers(approval.getApproverId().toString()); + newSysNotificationParamsVo.setSender(info.getApplicantId()); + newSysNotificationParamsVo.setNotification_url(info.getUrl()); + newSysNotificationParamsVo.setReceivers(info.getApproverId().toString()); newSysNotificationParamsVo.setContent(appContentFormat); infoPublishService.pushSysInfo(newSysNotificationParamsVo); //推送消息给审批人 NewSysNotificationParamsVo approveParamsVo = new NewSysNotificationParamsVo(); - String contentTemplate="{}发布的{}\"{}\"{}审核未通过"; - String contentFormat = StrUtil.format(contentTemplate,approval.getApplicantName(),ApprovalType.getDescription(approval.getType()) - ,getModelNameByType(approval.getContent(),approval.getType())); - approveParamsVo.setType(2); approveParamsVo.setContent(contentFormat); - approveParamsVo.setSender(approval.getApproverId()); - approveParamsVo.setNotification_url(approval.getUrl()); - approveParamsVo.setReceivers(approval.getApplicantId().toString()); + approveParamsVo.setSender(info.getApproverId()); + approveParamsVo.setNotification_url(info.getUrl()); + approveParamsVo.setReceivers(info.getApplicantId().toString()); infoPublishService.pushSysInfo(newSysNotificationParamsVo); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java index 13afa67e..fdf6a9d8 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java @@ -1,11 +1,6 @@ package com.ruoyi.platform.service.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; -import cn.hutool.http.HttpUtil; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.security.utils.SecurityUtils; @@ -31,7 +26,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpRequest; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -736,7 +730,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { String titleTemplate = "{}发布的数据集\"{}\"需要审核,请查看"; String urlTemplate = "/dataset/dataset/info/{}?name={}&owner={}&identifier={}&is_public={}"; - String titleFormat = StrUtil.format(titleTemplate, username, newDatasetDesc.getIdentifier()); + String titleFormat = StrUtil.format(titleTemplate, username, newDatasetDesc.getName()); String urlFormat = StrUtil.format(urlTemplate, newDatasetDesc.getId(), newDatasetDesc.getName(), newDatasetDesc.getOwner(), newDatasetDesc.getIdentifier(), newDatasetDesc.getIsPublic()); approvalRequest.setTitle(titleFormat); diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml index 9ce995ec..9a6d2d8b 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml @@ -50,6 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + update approval_info @@ -60,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" applicant_time = #{applicantTime}, applicant_name = #{applicantName}, approver_id = #{approverId}, - approver_time = #{approverTime}, + approver_time = sysdate(), title = #{title}, type = #{type}, url = #{url},