更新工作流

whycxzp

2022-07-26 afa42673b2163230c0f7a19e3746f00b5707b0b5

 src/main/java/com/whyc/service/WorksheetMainService.java

@@ -85,7 +85,9 @@
            return false;
        }
        //产品bom/图纸图片提交
        bomList.forEach(bom->bom.setMainId(main.getId()));
        bomList.forEach(bom->{
            bom.setMainId(main.getId());
        });
        approvingService.insert(bomList);
        return true;
    }
@@ -241,6 +243,10 @@
        QueryWrapper<WorksheetMain> query = Wrappers.query();
        query.eq("create_user_id",user.getId()).in("status",1,2);
        List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
        //查询主表状态对应的子表
        worksheetMainList.forEach(main -> {
            main.setApprovingUser(linkService.getApprovingUser(main.getId()));
        });
        PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
        return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
    }
@@ -258,12 +264,14 @@
        Response<PageInfo<WorksheetMain>> response = new Response<>();
        PageHelper.startPage(pageNum,pageSize);
        List<WorksheetMain> worksheetMainList = null;
        //自己的工单
        if(!user.getRoleId().equals("1003")){
            QueryWrapper<WorksheetMain> query = Wrappers.query();
            query.eq("create_user_id",user.getId()).in("status",5);
            worksheetMainList = mainMapper.selectList(query);

        }else{
            //总经理,节点审批人为自己
            worksheetMainList = linkService.getInfoList2(user.getId(),1);
        }
        PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
@@ -279,7 +287,7 @@

    public Response<PageInfo<WorksheetMain>> getHandledListPage(DocUser user, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        List<WorksheetMain> worksheetMainList = linkService.getInfoList2(user.getId(),1);
        List<WorksheetMain> worksheetMainList = linkService.getInfoList3(user.getId(),1);
        PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
        return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
    }