From 1a7af6fff5185bb257c16b0445140c93263a3331 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 15 一月 2024 11:18:17 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index 3ebe39f..18bc958 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -13,6 +13,10 @@
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;
@@ -63,10 +67,21 @@
@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) {
- List<Project> Project =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);
}
@@ -74,6 +89,9 @@
@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);
}
@@ -90,8 +108,7 @@
map.put("year", year);
project.setYear(year);
project.setCode(sysCodeRuleService.getNewCode(map));
- String leaderName = sysUserService.getUsersName(Convert.toLong(project.getProjectLeader()));
- project.setProjectLeader(leaderName);
+
projectService.insert(project);
return Result.ok();
}
@@ -102,8 +119,6 @@
public Result update(@RequestBody Project project) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(project, UpdateGroup.class, DefaultGroup.class);
- String leaderName = sysUserService.getUsersName(Convert.toLong(project.getProjectLeader()));
- project.setProjectLeader(leaderName);
projectService.update(project);
return Result.ok();
}
@@ -119,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);
+ }
+
}
--
Gitblit v1.9.1