From 52a302b11c08cbc564ff3931038ae57a305a95d6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 23 一月 2024 09:23:52 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 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 a136934..c7277c8 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,11 @@
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.MyProjectRoleDto;
+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;
@@ -67,17 +72,34 @@
@ApiImplicitParam(name = "pageCode", value = "椤甸潰鏍囪瘑", dataType = Constant.QT.STRING),
})
public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
- if (queryFilter.getParams().containsValue("baseline_release")||queryFilter.getParams().containsValue("config_item_warehouse")){
- queryFilter.getParams().replace("tableName","");
+ 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);
+ 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("myProjectRole/{projectId}")
+ @ApiOperation("鑾峰彇褰撳墠鐢ㄦ埛鐨勯」鐩鑹�")
+ public Result<MyProjectRoleDto> myProjectRole(@PathVariable("projectId") Long projectId) {
+ MyProjectRoleDto data = projectService.getMyProjectRole(projectId);
+ return Result.ok(data);
}
@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);
}
@@ -94,8 +116,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();
}
@@ -106,8 +127,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();
}
@@ -123,4 +142,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