协同办公新增和修改和分页查询增加类型区分

zss

2025-08-13 bc82778aa2b8c74fc0946ef6475857d2d9060a9f

协同办公新增和修改和分页查询增加类型区分

 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -83,6 +83,7 @@
        approveProcess.setApproveOverTime(null);
        approveProcess.setApproveStatus(0);
        approveProcess.setApproveDelete(0);
        approveProcess.setApproveType(approveProcessVO.getApproveType());
        approveProcess.setCreateTime(LocalDateTime.now());
        approveProcess.setTenantId(approveProcessVO.getApproveDeptId());
        approveProcess.setApproveUserIds(approveProcessVO.getApproveUserIds());

 src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java

@@ -20,4 +20,8 @@
    private String approveTime;

    private Integer approveStatus;
    /**
     * 审批类型
     */
    private Integer approveType;
}

 src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java

@@ -21,4 +21,9 @@
    private String approveUserIds;

    private String approveReason;

    /**
     * 审批类型
     */
    private Integer approveType;
}

 src/main/resources/mapper/approve/ApproveProcessMapper.xml

@@ -35,5 +35,8 @@
        <if test="req.approveStatus != null or req.approveStatus == 0">
            and approve_status = #{req.approveStatus}
        </if>
        <if test="req.approveType != null ">
            and approve_type = #{req.approveType}
        </if>
    </select>
</mapper>