Commit 0f6d1fe6 authored by wujipeng's avatar wujipeng
Browse files

逻辑修改

parent d9e40f3d
...@@ -56,13 +56,6 @@ public class ProjectController { ...@@ -56,13 +56,6 @@ public class ProjectController {
@GetMapping("/{id}") @GetMapping("/{id}")
public ResponseEntity<ProjectEntity> getProjectById(@PathVariable Integer id) { public ResponseEntity<ProjectEntity> getProjectById(@PathVariable Integer id) {
ProjectEntity project = projectService.getProjectById(id); ProjectEntity project = projectService.getProjectById(id);
String createUserId = project.getCreateUserId();
if (BeanUtil.isNotEmpty(createUserId)) {
UserEntity user = userService.getById(createUserId);
if (BeanUtil.isNotEmpty(user)) {
project.setProjectLeader(user.getName());
}
}
return ResponseEntity.ok(project); return ResponseEntity.ok(project);
} }
...@@ -74,6 +67,13 @@ public class ProjectController { ...@@ -74,6 +67,13 @@ public class ProjectController {
*/ */
@PostMapping @PostMapping
public ResponseEntity<Integer> insertProject(@RequestBody ProjectEntity project) { public ResponseEntity<Integer> insertProject(@RequestBody ProjectEntity project) {
String createUserId = project.getUserId();
if (BeanUtil.isNotEmpty(createUserId)) {
UserEntity user = userService.getById(createUserId);
if (BeanUtil.isNotEmpty(user)) {
project.setProjectLeader(user.getName());
}
}
int result = projectService.insertProject(project); int result = projectService.insertProject(project);
return new ResponseEntity<>(result, HttpStatus.CREATED); return new ResponseEntity<>(result, HttpStatus.CREATED);
} }
......
...@@ -26,4 +26,5 @@ public class UserEntity { ...@@ -26,4 +26,5 @@ public class UserEntity {
private String departments; private String departments;
private String email; private String email;
private String password; private String password;
private String phone;
} }
...@@ -42,8 +42,9 @@ ...@@ -42,8 +42,9 @@
</select> </select>
<insert id="insertProject"> <insert id="insertProject">
INSERT INTO project (start_time, end_time, `describe`, project_name,visible_people, create_user_id) INSERT INTO project (start_time, end_time, `describe`, project_name, visible_people, create_user_id,
VALUES (#{startTime}, #{endTime}, #{describe}, #{projectName},#{visiblePeople},#{userId}) project_leader)
VALUES (#{startTime}, #{endTime}, #{describe}, #{projectName}, #{visiblePeople}, #{userId}, #{projectLeader})
</insert> </insert>
<update id="updateProject"> <update id="updateProject">
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
name, name,
departments, departments,
create_time as createTime, create_time as createTime,
email email,
phone
FROM FROM
user user
WHERE WHERE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment