From ebab2501fa485c8d62d90b67aabe6f6d81847636 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 06 十二月 2023 16:12:05 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 c626323..a19671b 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
@@ -1,6 +1,7 @@
package com.zt.life.modules.project.controller;
+import cn.hutool.core.convert.Convert;
import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
@@ -15,6 +16,7 @@
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.sys.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -45,6 +47,9 @@
private ProjectService projectService;
@Autowired
private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysUserService sysUserService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -82,9 +87,11 @@
String year = sdf.format(new Date());
Map<String, String> map = new HashMap<>();
map.put("funCode", "project");
- map.put("year",year);
+ 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();
}
@@ -95,8 +102,9 @@
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();
}
--
Gitblit v1.9.1