审批功能联调

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;

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="content != null and content != ''">content,</if>
         <if test="applicantTime != null">applicant_time,</if>
         <if test="applicantId != null and applicantId != ''">applicant_id,</if>
+        <if test="applicantName != null and applicantName != ''">applicant_name,</if>
         <if test="approverId != null and approverId != ''">approver_id,</if>
         <if test="title != null and title != ''">title,</if>
         <if test="type != null and type != ''">type,</if>
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="result != null and result != ''">#{result},</if>
         <if test="content != null and content != ''">#{content},</if>
         <if test="applicantId != null and applicantId != ''">#{applicantId},</if>
+        <if test="applicantName != null and applicantName != ''">#{applicantName},</if>
         <if test="approverId != null and approverId != ''">#{approverId},</if>
         <if test="approverTime != null">#{approverTime},</if>
         <if test="title != null and title != ''">#{title},</if>