From bb3bc1c8508dc28d1780c2b0e068595baedb5100 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 12 一月 2024 16:42:17 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 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 ae3fd5c..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;
@@ -67,10 +71,17 @@
@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().containsValue("test_review_comment")){
- 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);
}
@@ -78,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);
}
@@ -94,8 +108,7 @@
map.put("year", year);
project.setYear(year);
project.setCode(sysCodeRuleService.getNewCode(map));
- String leaderName = sysUserService.getUsersName(project.getProjectLeader());
- project.setProjectLeader(leaderName);
+
projectService.insert(project);
return Result.ok();
}
@@ -106,21 +119,6 @@
public Result update(@RequestBody Project project) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(project, UpdateGroup.class, DefaultGroup.class);
- 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();
}
@@ -136,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