| src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/approve/service/IApproveProcessService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/approve/vo/ApproveProcessVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/approve/ApproveProcessMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.approve.vo.ApproveProcessVo; import com.ruoyi.approve.pojo.ApproveProcess; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,7 +17,7 @@ @Mapper public interface ApproveProcessMapper extends BaseMapper<ApproveProcess> { IPage<ApproveProcess> listPage(Page page,@Param("req") ApproveProcess approveProcess); IPage<ApproveProcessVo> listPage(Page page, @Param("req") ApproveProcess approveProcess); } src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.approve.vo.ApproveProcessVo; import com.ruoyi.approve.pojo.ApproveProcess; import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo; import com.ruoyi.approve.bean.vo.ApproveProcessVO; @@ -23,7 +24,7 @@ */ List<SysDept> selectDeptListByDeptIds(Long[] deptIds); IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess); IPage<ApproveProcessVo> listAll(Page page, ApproveProcess approveProcess); void delApprove(List<Long> ids); src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.approve.vo.ApproveProcessVo; import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo; import com.ruoyi.approve.bean.vo.ApproveProcessConfigNodeVo; import com.ruoyi.approve.bean.vo.ApproveProcessVO; @@ -16,6 +17,9 @@ import com.ruoyi.approve.service.ApproveProcessConfigNodeService; import com.ruoyi.approve.service.IApproveNodeService; import com.ruoyi.approve.service.IApproveProcessService; import com.ruoyi.basic.enums.ApplicationTypeEnum; import com.ruoyi.basic.enums.RecordTypeEnum; import com.ruoyi.basic.utils.FileUtil; import com.ruoyi.common.enums.FileNameType; import com.ruoyi.common.utils.OrderUtils; import com.ruoyi.common.utils.SecurityUtils; @@ -63,6 +67,7 @@ private final ShippingInfoMapper shippingInfoMapper; private final ApproveNodeMapper approveNodeMapper; private final ApproveProcessConfigNodeService approveProcessConfigNodeService; private final FileUtil fileUtil; @Override public void addApprove(ApproveProcessVO approveProcessVO) throws Exception { @@ -150,11 +155,11 @@ } @Override public IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess) { IPage<ApproveProcess> approveProcessIPage = approveProcessMapper.listPage(page, approveProcess); List<ApproveProcess> records = approveProcessIPage.getRecords(); public IPage<ApproveProcessVo> listAll(Page page, ApproveProcess approveProcess) { IPage<ApproveProcessVo> approveProcessIPage = approveProcessMapper.listPage(page, approveProcess); List<ApproveProcessVo> records = approveProcessIPage.getRecords(); for (ApproveProcess record : records) { for (ApproveProcessVo record : records) { List<CommonFile> allFiles = new ArrayList<>(); // 閲囪喘瀹℃壒鏌ヨ @@ -198,6 +203,7 @@ } record.setCommonFileList(allFiles); record.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.APPROVE_PROCESS, record.getId())); } return approveProcessIPage; } src/main/java/com/ruoyi/approve/vo/ApproveProcessVo.java
对比新文件 @@ -0,0 +1,12 @@ package com.ruoyi.approve.vo; import com.ruoyi.approve.pojo.ApproveProcess; import com.ruoyi.basic.dto.StorageBlobVO; import lombok.Data; import java.util.List; @Data public class ApproveProcessVo extends ApproveProcess { private List<StorageBlobVO> storageBlobVOs; } src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
@@ -193,6 +193,7 @@ KNOWLEDGE_BASE("knowledge_base"), NOTIFICATION_MANAGEMENT("notification_management"), APPROVE_NODE("approve_node"), APPROVE_PROCESS("approve_process"), APPROVE_PROCESS_CONFIG_NODE("approve_process_config_node"), APPROVE_LOG("approve_log"), ANNUAL_LEAVE_SETTING("annual_leave_setting"), src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -27,7 +27,7 @@ approve_user_names,approve_reason,approve_time,approve_over_time,approve_status, approve_delete,tenant_id,approve_type,approve_remark </sql> <select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess"> <select id="listPage" resultType="com.ruoyi.approve.vo.ApproveProcessVo"> select * from approve_process where approve_delete = 0 <if test="req.approveId != null and req.approveId != ''"> and approve_id like concat('%',#{req.approveId},'%')