zjh 本地 2023/12/26 -1

zjh

2023-12-26 bf84842d69b99d79ee17996de65bf8a2bab4ac07

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java

@@ -66,27 +66,34 @@
    public AjaxResult getlist(@RequestParam(required = false) @ApiParam(value = "项目名称") String proName,
                              @RequestParam(required = false) @ApiParam(value = "检查类别") String checkType,
                              @RequestParam(required = false) @ApiParam(value = "部门id") String deptId) {
        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
        wq0.eq(TjProject::getProParentId, 0);
        if(null !=proName){
            wq0.like(TjProject::getProName,proName);
        }
        if(null !=checkType){
            wq0.like(TjProject::getProCheckType,checkType);
        }
        if(null !=deptId){
            wq0.like(TjProject::getDeptId,deptId);
        }
//        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
//        wq0.eq(TjProject::getProParentId, 0);
//        if(null !=proName){
//            wq0.like(TjProject::getProName,proName);
//        }
//        if(null !=checkType){
//            wq0.like(TjProject::getProCheckType,checkType);
//        }
//        if(null !=deptId){
//            wq0.like(TjProject::getDeptId,deptId);
//        }
//
//        List<TjProject> tjProjects = tjProjectService.list(wq0);

        List<TjProject> tjProjects = tjProjectService.list(wq0);
        //上面的换sql
        final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);

        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
                LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjProject::getProParentId, project.getProId());
                if(null !=proName) {
                    wq1.like(TjProject::getProName, proName);
                }
                List<TjProject> projectList = tjProjectService.list(wq1);
                project.setTjProjectList(projectList);

                //根据每个项目的deptId拿到name  2023/2/7

                SysDept sysDept = deptService.selectDeptById(project.getDeptId());
                if (sysDept!=null){
                    project.setDeptName(sysDept.getDeptName());