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 | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 ad1e21d..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,8 +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.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;
@@ -74,14 +76,21 @@
queryFilter.getParams().replace("tableName", "");
}
List<Project> Project = projectService.page(queryFilter);
- for (Project project2 :Project){
+ for (Project project2 : Project) {
String leaderName = project2.getProjectLeader();
- if (leaderName.length()>10){
- leaderName=sysUserService.getNames(leaderName);
+ 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}")
@@ -107,6 +116,7 @@
map.put("year", year);
project.setYear(year);
project.setCode(sysCodeRuleService.getNewCode(map));
+
projectService.insert(project);
return Result.ok();
}
--
Gitblit v1.9.1