lxw
2022-08-03 6fb48a96940d9d187d89161e75b09f2603cce764
src/main/java/com/whyc/service/WorksheetMainService.java
@@ -39,6 +39,7 @@
    private DocUserMapper userMapper;
    @Autowired
    @Lazy
    private ProductBomApprovingService approvingService;
    @Transactional
@@ -102,6 +103,22 @@
            bom.setMainId(main.getId());
            bom.setUpUserId(user.getId());
            bom.setRejectVersion(nextRejectVersion);
            bom.setCreateDate(new Date());
            if(bom.getDwgUrl()==null){
                bom.setDwgUrl("");
            }else {
                bom.setDwgUrl(bom.getDwgUrl());
            }
            if(bom.getFileUrl()==null){
                bom.setFileUrl("");
            }else {
                bom.setFileUrl(bom.getFileUrl());
            }
            if(bom.getPictureUrl()==null){
                bom.setPictureUrl("");
            }else{
                bom.setPictureUrl(bom.getPictureUrl());
            }
        });
        approvingService.insert(bomList);
        return true;
@@ -262,7 +279,7 @@
    public Response<PageInfo<WorksheetMain>> getApprovingListPage(DocUser user, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        QueryWrapper<WorksheetMain> query = Wrappers.query();
        query.eq("create_user_id",user.getId()).in("status",1,2);
        query.eq("create_user_id",user.getId()).in("status",1,2).orderByDesc("id");
        List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
        //查询主表状态对应的子表
        worksheetMainList.forEach(main -> {
@@ -275,7 +292,7 @@
    public Response<PageInfo<WorksheetMain>> getRejectedListPage(DocUser user, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        QueryWrapper<WorksheetMain> query = Wrappers.query();
        query.eq("create_user_id",user.getId()).in("status",0);
        query.eq("create_user_id",user.getId()).in("status",0).orderByDesc("id");
        List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
        PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
        return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
@@ -288,7 +305,7 @@
        //自己的工单
        if(!user.getRoleId().equals("1003")){
            QueryWrapper<WorksheetMain> query = Wrappers.query();
            query.eq("create_user_id",user.getId()).in("status",5);
            query.eq("create_user_id",user.getId()).in("status",5).orderByDesc("id");
            worksheetMainList = mainMapper.selectList(query);
        }else{
@@ -301,7 +318,7 @@
    public Response<PageInfo<WorksheetMain>> getHandlingListPage(DocUser user, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        List<WorksheetMain> worksheetMainList = linkService.getInfoList2(user.getId(),0);
        List<WorksheetMain> worksheetMainList = linkService.getInfoList3(user.getId(),0);
        PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
        return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
    }