Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2023-10-26 3f3e3cf98ccddd3426b5d11d705a2ae573508d77

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

 src/main/java/com/whyc/controller/WorksheetMainController.java

@@ -182,4 +182,13 @@
        return service.procedurePreview(response,mainId);
    }

    /**
     * 询所有的工单,所有人可见
     */
    @PostMapping("getAllPage")
    @ApiOperation(value = "询所有的工单,所有人可见")
    public Response getAllPage(@RequestBody WorksheetMain param) {
        return service.getAllPage(param);
    }

}

 src/main/java/com/whyc/pojo/WorksheetMain.java

@@ -81,6 +81,12 @@
    @TableField(exist = false)
    private ProcedureDoc procedureDoc;

    @TableField(exist = false)
    private Integer pageNum;

    @TableField(exist = false)
    private Integer pageSize;

    public Integer getId() {
        return id;
    }
@@ -240,4 +246,20 @@
    public void setProcedureDoc(ProcedureDoc procedureDoc) {
        this.procedureDoc = procedureDoc;
    }

    public void setPageNum(Integer pageNum) {
        this.pageNum = pageNum;
    }

    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }

    public Integer getPageNum() {
        return pageNum;
    }

    public Integer getPageSize() {
        return pageSize;
    }
}

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

@@ -249,6 +249,9 @@
                for (int k = 2; k < lastRowNum + 1; k++) {
                    if(k==2){
                        product.setParentCode(sheet.getRow(2).getCell(1).getStringCellValue());
                        if(!originalFilename.contains(product.getParentCode())){
                            return response.set(1,false,"上传的产品压缩包必须包含产品编码");
                        }
                        product.setParentName(sheet.getRow(2).getCell(2).getStringCellValue());
                        String parentModel = sheet.getRow(2).getCell(3).getStringCellValue();
                        parentModel = parentModel.trim();

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

@@ -892,4 +892,32 @@
            e.printStackTrace();
        }*/
    }

    /**
     * 查询所有的工单,所有人可见
     * @param param
     * @return
     */
    public Response getAllPage(WorksheetMain param) {
        Integer pageNum = param.getPageNum();
        Integer pageSize = param.getPageSize();
        PageHelper.startPage(pageNum,pageSize);

        int createUserId = param.getCreateUserId().intValue();
        Date beginTime = param.getBeginTime();
        Date endTime = param.getEndTime();
        Integer type = param.getType();
        QueryWrapper<WorksheetMain> query = Wrappers.query();
        if(createUserId>0){
            query.eq("create_user_id",createUserId);
        }
        query.ge("begin_time",beginTime);
        query.le("begin_time",endTime);
        if(type!=null && type>=0){
            query.eq("type",type);
        }
        List<WorksheetMain> worksheetMains = mainMapper.selectList(query);
        PageInfo pageInfo = new PageInfo(worksheetMains);
        return new Response().set(1,pageInfo);
    }
}