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 a5f07921..4b6cab36 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 @@ -4,11 +4,10 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.ruoyi.platform.domain.*; import com.ruoyi.platform.mapper.ApprovalInfoMapper; import com.ruoyi.platform.service.ApprovalService; -import com.ruoyi.platform.service.ModelsService; -import com.ruoyi.platform.service.NewDatasetService; import com.ruoyi.platform.vo.NewDatasetVo; import com.ruoyi.system.api.RemoteInfoPublishService; import com.ruoyi.system.api.domain.NewSysNotificationParamsVo; @@ -177,11 +176,11 @@ public class ApprovalServiceImpl implements ApprovalService { private String getModelNameByType(String content,String type) { if (ApprovalType.DATASET.getCode().equals(type)) { - NewDatasetVo newDatasetVo = BeanUtil.toBean(content, NewDatasetVo.class); + NewDatasetVo newDatasetVo = JSONUtil.toBean(content, NewDatasetVo.class); return newDatasetVo.getName(); } if (ApprovalType.MODEL.getCode().equals(type)) { - Models models = BeanUtil.toBean(content, Models.class); + Models models = JSONUtil.toBean(content, Models.class); return models.getName(); } return null; 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 e271972f..973a3518 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 @@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, applicant_time, applicant_id, + applicant_name, approver_id, title, type, @@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{result}, #{content}, #{applicantId}, + #{applicantName}, #{approverId}, #{approverTime}, #{title},