修改

jinlin

2024-01-12 bb3bc1c8508dc28d1780c2b0e068595baedb5100

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

@@ -1,6 +1,7 @@
package com.zt.life.modules.project.controller;


import cn.hutool.core.convert.Convert;
import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
@@ -12,9 +13,14 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.core.context.User;
import com.zt.core.context.UserContext;
import com.zt.core.sys.model.SysUser;
import com.zt.life.modules.project.dto.ProjectUserDto;
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.sys.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -46,6 +52,9 @@
    @Autowired
    private SysCodeRuleService sysCodeRuleService;

    @Autowired
    private SysUserService sysUserService;

    @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
@@ -58,17 +67,31 @@
            @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);
        for (Project project2 :Project){
            String leaderName = project2.getProjectLeader();
            if (leaderName.length()>10){
                leaderName=sysUserService.getNames(leaderName);
            }
            project2.setProjectLeader(leaderName);
        }
        return PageResult.ok(Project);
    }

    @GetMapping("{id}")
    @ApiOperation("信息")
    public Result<Project> get(@PathVariable("id") Long id) {
        Project data = projectService.get(id);
        if (data.getBizDeptId() == null) {
            data.setBizDeptId(UserContext.getDeptId().toString());
        }
        return Result.ok(data);
    }

@@ -82,9 +105,10 @@
        String year = sdf.format(new Date());
        Map<String, String> map = new HashMap<>();
        map.put("funCode", "project");
        map.put("year",year);
        map.put("year", year);
        project.setYear(year);
        project.setCode(sysCodeRuleService.getNewCode(map));

        projectService.insert(project);
        return Result.ok();
    }
@@ -96,7 +120,6 @@
        //效验数据
        ValidatorUtils.validateEntity(project, UpdateGroup.class, DefaultGroup.class);
        projectService.update(project);

        return Result.ok();
    }

@@ -111,4 +134,16 @@
        return Result.ok();
    }

    @GetMapping("getUsersLists")
    @ApiOperation("返回用户列表")
    @LogOperation("返回用户列表")
    public Result<ProjectUserDto> getUsersLists(String deptId) {
        ProjectUserDto projectUserDto = new ProjectUserDto();
        projectUserDto.setZrr(sysUserService.getUsersList("zrr", deptId));
        projectUserDto.setCsry(sysUserService.getUsersList("csry", deptId));
        projectUserDto.setShry(sysUserService.getUsersList("shry", deptId));
        projectUserDto.setPzry(sysUserService.getUsersList("pzry", deptId));
        return Result.ok(projectUserDto);
    }

}