diff --git a/oms_web/oms_vue/src/api/approve/all/index.js b/oms_web/oms_vue/src/api/approve/all/index.js new file mode 100644 index 00000000..c84defab --- /dev/null +++ b/oms_web/oms_vue/src/api/approve/all/index.js @@ -0,0 +1,20 @@ +import request from '@/utils/request' + +// 查询审批任务列表 +export function listApprovalTask(query) { + const { pageNum, pageSize, orderByColumn, isAsc, ...body } = query + return request({ + url: '/approve/task/vue/list', + method: 'post', + params: { pageNum, pageSize, orderByColumn, isAsc }, + data: body + }) +} + +// 获取审批任务数量统计 +export function getApprovalTaskTotal() { + return request({ + url: '/approve/task/vue/total', + method: 'get' + }) +} diff --git a/oms_web/oms_vue/src/views/approve/all/index.vue b/oms_web/oms_vue/src/views/approve/all/index.vue new file mode 100644 index 00000000..f685ab4b --- /dev/null +++ b/oms_web/oms_vue/src/views/approve/all/index.vue @@ -0,0 +1,1327 @@ + + + + + diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueApprovalTaskController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueApprovalTaskController.java new file mode 100644 index 00000000..6aa5d118 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueApprovalTaskController.java @@ -0,0 +1,46 @@ +package com.ruoyi.sip.controller.vue; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.sip.domain.ApprovalTask; +import com.ruoyi.sip.service.IApprovalTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 审批任务Controller (Vue) + * + * @author auto + * @date 2026-07-27 + */ +@RestController +@RequestMapping("/approve/task/vue") +public class VueApprovalTaskController extends BaseController { + + @Autowired + private IApprovalTaskService approvalTaskService; + + /** + * 查询审批任务列表 + * 查询条件：流程编号、流程标题、任务类型、发起人、审批状态 + */ + @PostMapping("/list") + public TableDataInfo list(@RequestBody ApprovalTask approvalTask) { + startPage(); + List list = approvalTaskService.selectApprovalTaskList(approvalTask); + return getDataTable(list); + } + + /** + * 获取审批任务数量统计 + * 返回：总数、待处理数量、已通过数量、已驳回数量 + */ + @GetMapping("/total") + public AjaxResult getTotal() { + return AjaxResult.success(approvalTaskService.selectApprovalTaskCount()); + } + +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ApprovalTask.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ApprovalTask.java new file mode 100644 index 00000000..22a06d1b --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ApprovalTask.java @@ -0,0 +1,58 @@ +package com.ruoyi.sip.domain; + +import lombok.Data; +import lombok.Getter; +import lombok.ToString; +import com.ruoyi.common.core.domain.BaseEntity; + +import java.math.BigDecimal; + +/** + * 审批任务对象 + * + * @author auto + * @date 2026-07-27 + */ +@Data +@ToString +public class ApprovalTask extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 流程编号 */ + private String processNo; + + /** 流程标题 */ + private String processTitle; + + /** 审批类型 */ + private String approveType; + + /** 发起人 */ + private String initiator; + + /** 发起时间 */ + private String startTime; + + /** 审批人 */ + private String approveUser; + + /** 业务主键 */ + private String businessKey; + + /** 流程类型 */ + private String processKey; + + /** 待办任务ID */ + private String taskId; + + /** 含税总计 */ + private BigDecimal totalAmount; + + /** 审批状态（1-待处理 / 2-已通过 / 3-已驳回） */ + private String approveStatus; + +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ApprovalTaskMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ApprovalTaskMapper.java new file mode 100644 index 00000000..dabe319a --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ApprovalTaskMapper.java @@ -0,0 +1,31 @@ +package com.ruoyi.sip.mapper; + +import com.ruoyi.sip.domain.ApprovalTask; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * 审批任务Mapper接口 + * + * @author auto + * @date 2026-07-27 + */ +public interface ApprovalTaskMapper { + + /** + * 查询审批任务列表 + * + * @param approvalTask 查询条件 + * @return 审批任务集合 + */ + List selectApprovalTaskList(ApprovalTask approvalTask); + + /** + * 获取审批任务数量统计 + * + * @return 总数、待处理数量、已通过数量、已驳回数量 + */ + Map selectApprovalTaskCount(@Param("approveUser") String approveUser); +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IApprovalTaskService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IApprovalTaskService.java new file mode 100644 index 00000000..e34cc7db --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IApprovalTaskService.java @@ -0,0 +1,31 @@ +package com.ruoyi.sip.service; + +import com.ruoyi.sip.domain.ApprovalTask; + +import java.util.List; +import java.util.Map; + +/** + * 审批任务Service接口 + * + * @author auto + * @date 2026-07-27 + */ +public interface IApprovalTaskService { + + /** + * 查询审批任务列表 + * + * @param approvalTask 审批任务查询条件 + * @return 审批任务集合 + */ + List selectApprovalTaskList(ApprovalTask approvalTask); + + /** + * 获取审批任务数量统计 + * + * @return 总数、待处理数量、已通过数量、已驳回数量 + */ + Map selectApprovalTaskCount(); + +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ApprovalTaskServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ApprovalTaskServiceImpl.java new file mode 100644 index 00000000..3497602e --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ApprovalTaskServiceImpl.java @@ -0,0 +1,48 @@ +package com.ruoyi.sip.service.impl; + +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.sip.domain.ApprovalTask; +import com.ruoyi.sip.mapper.ApprovalTaskMapper; +import com.ruoyi.sip.service.IApprovalTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 审批任务Service业务层处理 + * + * @author auto + * @date 2026-07-27 + */ +@Service +public class ApprovalTaskServiceImpl implements IApprovalTaskService { + + @Autowired + private ApprovalTaskMapper approvalTaskMapper; + + /** + * 查询审批任务列表 + * + * @param approvalTask 审批任务查询条件 + * @return 审批任务集合 + */ + @Override + public List selectApprovalTaskList(ApprovalTask approvalTask) { + approvalTask.setApproveUser(String.valueOf(ShiroUtils.getUserId())); + List list = approvalTaskMapper.selectApprovalTaskList(approvalTask); + return list; + } + + /** + * 获取审批任务数量统计 + * + * @return 总数、待处理数量、已通过数量、已驳回数量 + */ + @Override + public Map selectApprovalTaskCount() { + return approvalTaskMapper.selectApprovalTaskCount(String.valueOf(ShiroUtils.getUserId())); + } +} + diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml new file mode 100644 index 00000000..32d3bceb --- /dev/null +++ b/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml @@ -0,0 +1,878 @@ + + + + + + + + + + + + + + + + + + + + + + +