feat: task's related log

blade-service-api/wt-okr-api/src/main/java/com/wtkj/vo/ProjectVO.java

@@ -0,0 +1,18 @@
+package com.wtkj.vo;
+
+import com.wtkj.entity.Project;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author Blizzard
+ * @create at 2023-09-16 23:07
+ * @describe
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ProjectVO extends Project {
+
+
+	private String currentStageName;
+}

blade-service/wt-okr/src/main/java/com/wtkj/controller/ProjectController.java

@@ -8,6 +8,7 @@ import com.wtkj.entity.ProjectStage;
 import com.wtkj.service.IAsyncService;
 import com.wtkj.service.IProjectService;
 import com.wtkj.service.IProjectStageService;
+import com.wtkj.wrapper.ProjectWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -58,7 +59,7 @@ public class ProjectController {
 		query.setCurrent(dto.getCurrent());
 		query.setSize(dto.getSize());
 		IPage<Project> page = projectService.getPage(dto, Condition.getPage(query));
-		return R.data(page);
+		return R.data(ProjectWrapper.build().pageVO(page));
 	}
 
 	/**

blade-service/wt-okr/src/main/java/com/wtkj/service/IAsyncService.java

@@ -29,5 +29,6 @@ public interface IAsyncService {
 	void submitTaskMessage(Long userId, Task task);
 
 	//指定执行单位日志
-	void submitTaskOrgDept(Long userId, Task task);
+	// type: 1 指定执行单位 2.指定任务执行部门  3.指定项目经理 4.执行任务执行者
+	void updateTask(Integer type, Long userId, Task task);
 }

blade-service/wt-okr/src/main/java/com/wtkj/service/impl/AsyncServiceImpl.java

@@ -118,15 +118,70 @@ public class AsyncServiceImpl implements IAsyncService {
 				log.setUpdateTime(DateUtil.now());
 				logs.add(log);
 				if (task.getOrgDeptId() != null) {
-					TaskLog taskLog = new TaskLog();
-					taskLog.setTaskId(task.getId());
-					taskLog.setContent(userR.getData().getName() + " 指定了执行单位");
-					taskLog.setCreateDept(task.getCreateDept());
-					taskLog.setCreateUser(task.getCreateUser());
-					taskLog.setUpdateUser(task.getUpdateUser());
-					taskLog.setCreateTime(DateUtil.now());
-					taskLog.setUpdateTime(DateUtil.now());
-					logs.add(log);
+					Long orgDeptId = task.getOrgDeptId();
+					R<Dept> dept = sysClient.getDept(orgDeptId);
+					if (dept.isSuccess()) {
+						TaskLog taskLog = new TaskLog();
+						taskLog.setTaskId(task.getId());
+						taskLog.setContent(userR.getData().getName() + " 指定了执行单位为" + dept.getData().getDeptName());
+						taskLog.setCreateDept(task.getCreateDept());
+						taskLog.setCreateUser(task.getCreateUser());
+						taskLog.setUpdateUser(task.getUpdateUser());
+						taskLog.setCreateTime(DateUtil.now());
+						taskLog.setUpdateTime(DateUtil.now());
+						logs.add(log);
+					}
+				}
+				if (task.getExecuteDept() != null) {
+					Long executeDept = task.getExecuteDept();
+					R<Dept> dept = sysClient.getDept(executeDept);
+					if (dept.isSuccess()) {
+						TaskLog taskLog = new TaskLog();
+						taskLog.setTaskId(task.getId());
+						taskLog.setContent(userR.getData().getName() + " 指定了任务执行部门为" + dept.getData().getDeptName());
+						taskLog.setCreateDept(task.getCreateDept());
+						taskLog.setCreateUser(task.getCreateUser());
+						taskLog.setUpdateUser(task.getUpdateUser());
+						taskLog.setCreateTime(DateUtil.now());
+						taskLog.setUpdateTime(DateUtil.now());
+						logs.add(log);
+					}
+				}
+				if (task.getProjectManager() != null) {
+					Long projectManager = task.getProjectManager();
+					R<User> userR1 = userClient.userInfoById(projectManager);
+					if (userR1.isSuccess()) {
+						TaskLog taskLog = new TaskLog();
+						taskLog.setTaskId(task.getId());
+						taskLog.setContent(userR.getData().getName() + " 指定了项目经理为 " + userR1.getData().getName());
+						taskLog.setCreateDept(task.getCreateDept());
+						taskLog.setCreateUser(task.getCreateUser());
+						taskLog.setUpdateUser(task.getUpdateUser());
+						taskLog.setCreateTime(DateUtil.now());
+						taskLog.setUpdateTime(DateUtil.now());
+						logs.add(log);
+					}
+				}
+				if (task.getExecuteUser() != null) {
+					List<Long> userIds = Func.toLongList(task.getExecuteUser());
+					List<String> str = new ArrayList<>();
+					userIds.forEach(userId -> {
+						R<User> rpc = userClient.userInfoById(userId);
+						if (rpc.isSuccess()) {
+							str.add(rpc.getData().getName());
+						}
+					});
+					if (!CollectionUtils.isEmpty(str)) {
+						TaskLog taskLog = new TaskLog();
+						taskLog.setTaskId(task.getId());
+						taskLog.setContent(userR.getData().getName() + " 指定了任务执行者 " + Func.join(str));
+						taskLog.setCreateDept(task.getCreateDept());
+						taskLog.setCreateUser(task.getCreateUser());
+						taskLog.setUpdateUser(task.getUpdateUser());
+						taskLog.setCreateTime(DateUtil.now());
+						taskLog.setUpdateTime(DateUtil.now());
+						logs.add(log);
+					}
 				}
 				taskLogService.saveBatch(logs);
 			}
@@ -135,18 +190,80 @@ public class AsyncServiceImpl implements IAsyncService {
 	}
 
 	@Override
-	public void submitTaskOrgDept(Long userId, Task task) {
+	public void updateTask(Integer type, Long userId, Task task) {
 		R<User> userR = userClient.userInfoById(userId);
 		if (userR.isSuccess()) {
-			TaskLog log = new TaskLog();
-			log.setTaskId(task.getId());
-			log.setContent(userR.getData().getName() + " 指定了执行单位");
-			log.setCreateDept(task.getCreateDept());
-			log.setCreateUser(task.getCreateUser());
-			log.setUpdateUser(task.getUpdateUser());
-			log.setCreateTime(DateUtil.now());
-			log.setUpdateTime(DateUtil.now());
-			taskLogService.save(log);
+			List<TaskLog> logs = new ArrayList<>();
+			switch (type) {
+				case 1:
+					Long orgDeptId = task.getOrgDeptId();
+					R<Dept> dept = sysClient.getDept(orgDeptId);
+					if (dept.isSuccess()) {
+						TaskLog log = new TaskLog();
+						log.setTaskId(task.getId());
+						log.setContent(userR.getData().getName() + " 指定了执行单位为" + dept.getData().getDeptName());
+						log.setCreateDept(task.getCreateDept());
+						log.setCreateUser(task.getCreateUser());
+						log.setUpdateUser(task.getUpdateUser());
+						log.setCreateTime(DateUtil.now());
+						log.setUpdateTime(DateUtil.now());
+						logs.add(log);
+					}
+					break;
+				case 2:
+					Long executeDept = task.getExecuteDept();
+					R<Dept> dept1 = sysClient.getDept(executeDept);
+					if (dept1.isSuccess()) {
+						TaskLog log1 = new TaskLog();
+						log1.setTaskId(task.getId());
+						log1.setContent(userR.getData().getName() + " 指定了任务执行部门为" + dept1.getData().getDeptName());
+						log1.setCreateDept(task.getCreateDept());
+						log1.setCreateUser(task.getCreateUser());
+						log1.setUpdateUser(task.getUpdateUser());
+						log1.setCreateTime(DateUtil.now());
+						log1.setUpdateTime(DateUtil.now());
+						logs.add(log1);
+					}
+					break;
+				case 3:
+					Long projectManager = task.getProjectManager();
+					R<User> userR1 = userClient.userInfoById(projectManager);
+					if (userR1.isSuccess()) {
+						TaskLog log2 = new TaskLog();
+						log2.setTaskId(task.getId());
+						log2.setContent(userR.getData().getName() + " 指定了项目经理为 " + userR1.getData().getName());
+						log2.setCreateDept(task.getCreateDept());
+						log2.setCreateUser(task.getCreateUser());
+						log2.setUpdateUser(task.getUpdateUser());
+						log2.setCreateTime(DateUtil.now());
+						log2.setUpdateTime(DateUtil.now());
+						logs.add(log2);
+					}
+					break;
+				case 4:
+					List<Long> userIds = Func.toLongList(task.getExecuteUser());
+					List<String> str = new ArrayList<>();
+					userIds.forEach(id -> {
+						R<User> rpc = userClient.userInfoById(id);
+						if (rpc.isSuccess()) {
+							str.add(rpc.getData().getName());
+						}
+					});
+					if (!CollectionUtils.isEmpty(str)) {
+						TaskLog log3 = new TaskLog();
+						log3.setTaskId(task.getId());
+						log3.setContent(userR.getData().getName() + " 指定了任务执行者 " + Func.join(str));
+						log3.setCreateDept(task.getCreateDept());
+						log3.setCreateUser(task.getCreateUser());
+						log3.setUpdateUser(task.getUpdateUser());
+						log3.setCreateTime(DateUtil.now());
+						log3.setUpdateTime(DateUtil.now());
+						logs.add(log3);
+					}
+					break;
+			}
+
+			taskLogService.saveBatch(logs);
 		}
 	}
 

blade-service/wt-okr/src/main/java/com/wtkj/service/impl/TaskServiceImpl.java

@@ -47,12 +47,24 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 		} else {
 			//todo 任务状态处理
 			//执行的顶级单位
-			Long orgDeptId = task.getOrgDeptId();
+			Long userId = AuthUtil.getUserId();
 			Task byId = this.getById(taskId);
 			if (byId != null) {
-				//指定了执行单位
-				if (byId.getOrgDeptId() == null && orgDeptId != null) {
-					asyncService.submitTaskOrgDept(AuthUtil.getUserId(), task);
+				//1.指定了执行单位
+				if (byId.getOrgDeptId() == null && task.getOrgDeptId() != null) {
+					asyncService.updateTask(1, userId, task);
+				}
+				//2.指定任务执行部门
+				if (byId.getExecuteDept() == null && task.getExecuteDept() != null) {
+					asyncService.updateTask(2, userId, task);
+				}
+				//3.指定项目经理
+				if (byId.getProjectManager() == null && task.getProjectManager() != null) {
+					asyncService.updateTask(3, userId, task);
+				}
+				//4.指定任务执行者
+				if (byId.getExecuteUser() == null && task.getExecuteUser() != null) {
+					asyncService.updateTask(4, userId, task);
 				}
 			}
 			flag = this.updateById(task);

blade-service/wt-okr/src/main/java/com/wtkj/wrapper/ProjectWrapper.java

@@ -0,0 +1,40 @@
+package com.wtkj.wrapper;
+
+import com.wtkj.entity.Project;
+import com.wtkj.entity.ProjectStage;
+import com.wtkj.service.IProjectStageService;
+import com.wtkj.vo.ProjectVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
+
+import java.util.Objects;
+
+/**
+ * @author Blizzard
+ * @create at 2023-09-16 23:08
+ * @describe
+ */
+public class ProjectWrapper extends BaseEntityWrapper<Project, ProjectVO> {
+
+	private static IProjectStageService stageService;
+
+
+	public static ProjectWrapper build() {
+		stageService = SpringUtil.getBean(IProjectStageService.class);
+		return new ProjectWrapper();
+	}
+
+	@Override
+	public ProjectVO entityVO(Project entity) {
+		ProjectVO vo = Objects.requireNonNull(BeanUtil.copy(entity, ProjectVO.class));
+		Long currentStage = entity.getCurrentStage();
+		if (currentStage != null) {
+			ProjectStage byId = stageService.getById(currentStage);
+			if (byId != null) {
+				vo.setCurrentStageName(byId.getName());
+			}
+		}
+		return vo;
+	}
+}