调整工单审批2

jiazx0107

2026-01-17 cf3b3fe3f9d46e28ac84f1aa61a3d9754aabf421

 fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java

@@ -17,6 +17,7 @@
import com.fzzy.work.service.WorkOrderService;
import com.ruoyi.common.core.domain.entity.SysDictData;

import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;

@@ -42,44 +43,19 @@
    private BizWorkService bizWorkService;

    /**
     *
     * workOrderPR#pageQuery
     * 分页查询
     * @param page
     * @param param
     * 根据用户角色选择不同的工单信息
     * @param page 分页信息
     * @param param 参数
     */
    @DataProvider
    public void pageQuery(Page<WorkOrder> page, WorkOrderParam param) {
    public void pageQueryByUserType(Page<WorkOrder> page, WorkOrderParam param) {

        com.baomidou.mybatisplus.extension.plugins.pagination.Page<WorkOrder> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());

        if (null == param) param = new WorkOrderParam();
        param.setCompanyId(ContextUtil.getCompanyId());

        workOrderService.pageQuery(corePage, param);

        // 重新封装
        page.setEntities(corePage.getRecords());
        page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
    }

    /**
     *
     * workOrderPR#pageQuery2
     * 已经完成，分页查询
     * @param page
     * @param param
     */
    @DataProvider
    public void pageQuery2(Page<WorkOrder> page, WorkOrderParam param) {

        com.baomidou.mybatisplus.extension.plugins.pagination.Page<WorkOrder> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());

        if (null == param) param = new WorkOrderParam();
        param.setStatus(WorkStatus.STATUS_50.getCode());
        param.setCompanyId(ContextUtil.getCompanyId());

        workOrderService.pageQuery(corePage, param);
        workOrderService.pageQueryByUserType(corePage, param);

        // 重新封装
        page.setEntities(corePage.getRecords());