修改

jinlin

2024-01-02 a38a1ac77bb6ac9ea8bf0cf5f5f6b68d0e6e6974

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java

@@ -63,11 +63,15 @@
            @ApiImplicitParam(name = "criticalLevel", value = "关键等级", dataType = Constant.QT.STRING, format = "critical_level^EQ"),
            @ApiImplicitParam(name = "softwareType", value = "软件类型", dataType = Constant.QT.STRING, format = "software_type^EQ"),
            @ApiImplicitParam(name = "isContract", value = "是否签署合同", dataType = Constant.QT.STRING, format = "is_contract^EQ"),
            @ApiImplicitParam(name = "tableName", value = "功能表", dataType = Constant.QT.STRING)
            @ApiImplicitParam(name = "tableName", value = "功能表", dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = "pageCode", value = "页面标识", dataType = Constant.QT.STRING),
    })
    public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {

        return PageResult.ok(projectService.page(queryFilter));
        if (queryFilter.getParams().containsValue("baseline_release")||queryFilter.getParams().containsValue("config_item_warehouse")||queryFilter.getParams().containsValue("test_review_comment")){
            queryFilter.getParams().replace("tableName","");
        }
        List<Project> Project =projectService.page(queryFilter);
        return PageResult.ok(Project);
    }

    @GetMapping("{id}")
@@ -90,7 +94,7 @@
        map.put("year", year);
        project.setYear(year);
        project.setCode(sysCodeRuleService.getNewCode(map));
        String leaderName = sysUserService.getUsersName(Convert.toLong(project.getProjectLeader()));
        String leaderName = sysUserService.getUsersName(project.getProjectLeader());
        project.setProjectLeader(leaderName);
        projectService.insert(project);
        return Result.ok();
@@ -102,8 +106,21 @@
    public Result update(@RequestBody Project project) {
        //效验数据
        ValidatorUtils.validateEntity(project, UpdateGroup.class, DefaultGroup.class);
        String leaderName = sysUserService.getUsersName(Convert.toLong(project.getProjectLeader()));
        String leaderName = project.getProjectLeader();
        String projectTesters =project.getProjectTesters();
        String projectReviewer =project.getProjectReviewer();
        if (leaderName.length()>10){
            leaderName=sysUserService.getNames(leaderName);
        }
        if (projectTesters.length()>10){
            projectTesters=sysUserService.getNames(projectTesters);
        }
        if (projectReviewer.length()>10){
            projectReviewer=sysUserService.getNames(projectReviewer);
        }
        project.setProjectLeader(leaderName);
        project.setProjectTesters(projectTesters);
        project.setProjectReviewer(projectReviewer);
        projectService.update(project);
        return Result.ok();
    }