feat: 任务审核加审核人/审核时间

db/v2.0/20240416.sql

@@ -0,0 +1,12 @@
+alter table wm_task
+    add approval_user_id int null comment '审核人userId' after dept_review_task_count;
+
+alter table wm_task
+    add approval_time datetime null comment '审核时间' after approval_user_id;
+
+alter table wm_task
+    add dept_approval_user_id int null comment '企业审核人userId' after approval_time;
+
+alter table wm_task
+    add dept_approval_time datetime null comment '企业审核时间' after dept_approval_user_id;
+

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmTask.java

@@ -214,6 +214,38 @@ public class WmTask extends Model<WmTask> {
      */
     private Integer deptReviewTaskCount;
 
+	/**
+	 * 审核人userId
+	 */
+	private Integer approvalUserId;
+
+	/**
+	 * 审核人姓名
+	 */
+	@TableField(exist = false)
+	private String approvalUserName;
+
+	/**
+	 * 审核时间
+	 */
+	private LocalDateTime approvalTime;
+
+	/**
+	 * 企业审核人userId
+	 */
+	private Integer deptApprovalUserId;
+
+	/**
+	 * 企业审核人姓名
+	 */
+	@TableField(exist = false)
+	private String deptApprovalUserName;
+
+	/**
+	 * 企业审核时间
+	 */
+	private LocalDateTime deptApprovalTime;
+
     /**
      * 任务用户用户名
      */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -423,6 +423,8 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 		updateTaskWrapper.set(WmTask::getDeptReviewTaskCount, 1);
 		updateTaskWrapper.set(WmTask::getUpdateTime, now);
 		updateTaskWrapper.set(WmTask::getUpdateUser, operatorId);
+		updateTaskWrapper.set(WmTask::getDeptApprovalUserId, operatorId);
+		updateTaskWrapper.set(WmTask::getDeptApprovalTime, now);
 		log.info("task更新参数：条件id={},updateTime={},updateUser={},更新项approvalOpinion={},approvalInfo={},taskStatus={},realFlag={},deptReviewTaskCount={},updateTime={},updateUser={}",
 				taskId, queryTask.getUpdateTime(), queryTask.getUpdateUser(), approvalOpinion, approvalInfo, taskStatus, "0", 1, now, operatorId);
 		boolean updateTask = wmTaskService.update(updateTaskWrapper);
@@ -456,6 +458,8 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 		updateWrapper.set(WmReport::getReportStatus, reportStatus);
 		updateWrapper.set(WmReport::getUpdatePeople, operatorId);
 		updateWrapper.set(WmReport::getUpdateTime, now);
+		updateWrapper.set(WmReport::getApprovalPeople, operatorId);
+		updateWrapper.set(WmReport::getApprovalTime, now);
 		log.info("report更新参数：条件id={},updateTime={},updatePeople={},更新项reportStatus={},updatePeople={},updateTime={}",
 				reportId, queryReport.getUpdateTime(), queryReport.getUpdatePeople(), reportStatus, operatorId, now);
 		boolean updateReport = this.update(updateWrapper);
@@ -636,6 +640,8 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 			updateTaskWrapper.set(WmTask::getRealFlag, "0");
 			updateTaskWrapper.set(WmTask::getUpdateTime, now);
 			updateTaskWrapper.set(WmTask::getUpdateUser, operatorId);
+			updateTaskWrapper.set(WmTask::getDeptApprovalUserId, operatorId);
+			updateTaskWrapper.set(WmTask::getDeptApprovalTime, now);
 			log.info("task更新参数：条件id={},updateTime={},updateUser={},更新项approvalOpinion={},approvalInfo={},realFlag={},updateTime={},updateUser={}",
 					id, queryTask.getUpdateTime(), queryTask.getUpdateUser(), approvalOpinion, approvalInfo, 0, now, operatorId);
 			boolean updateTask = wmTaskService.update(updateTaskWrapper);
@@ -670,6 +676,8 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 		updateWrapper.set(WmReport::getReportStatus, reportStatus);
 		updateWrapper.set(WmReport::getUpdatePeople, operatorId);
 		updateWrapper.set(WmReport::getUpdateTime, now);
+		updateWrapper.set(WmReport::getApprovalPeople, operatorId);
+		updateWrapper.set(WmReport::getApprovalTime, now);
 		log.info("report更新参数：条件id={},updateTime={},updatePeople={},更新项reportStatus={},updatePeople={},updateTime={}",
 				reportId, queryReport.getUpdateTime(), queryReport.getUpdatePeople(), reportStatus, operatorId, now);
 		boolean updateReport = this.update(updateWrapper);
@@ -813,6 +821,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 			});
 		}
 
+		Integer userId = SecurityUtils.getUser().getId();
+		LocalDateTime now = LocalDateTime.now();
+
 		//更新任务表审批意见,查询所有未审核的任务，判断报告关联任务是否全部审核
 		LambdaUpdateWrapper<WmTask> updateTaskWrapper=new LambdaUpdateWrapper<>();
 		WmTask wmTask=new WmTask();
@@ -858,10 +869,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 			updateTaskWrapper.set(WmTask::getTaskStatus, TaskStatusEnum.FAIL_APPROVED.val());
 		}
 		updateTaskWrapper.set(WmTask::getRealFlag, "0");
+		updateTaskWrapper.set(WmTask::getDeptApprovalUserId, userId);
+		updateTaskWrapper.set(WmTask::getDeptApprovalTime, now);
 		wmTaskService.update(updateTaskWrapper);
 		taskList = wmTaskService.list(Wrappers.query(wmTask));
 		//更新报告状态
-		HnqzUser user= SecurityUtils.getUser();
 		//提交修改状态，更新时间
 		LambdaUpdateWrapper<WmReport> updateWrapper=new LambdaUpdateWrapper<>();
 
@@ -871,8 +883,10 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 		}else {//不为空，说明是部分审批
 			updateWrapper.set(WmReport::getReportStatus, ReportEnum.REPORT_STATUS_PART_APPROVAL.getType());
 		}
-		updateWrapper.set(WmReport::getUpdatePeople, user.getId());
-		updateWrapper.set(WmReport::getUpdateTime, LocalDateTime.now());
+		updateWrapper.set(WmReport::getUpdatePeople, userId);
+		updateWrapper.set(WmReport::getUpdateTime, now);
+		updateWrapper.set(WmReport::getApprovalPeople, userId);
+		updateWrapper.set(WmReport::getApprovalTime, now);
 		updateWrapper.eq(WmReport::getId, wmReport.getId());
 		this.update(updateWrapper);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -1619,10 +1619,15 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 			return R.failed("缺少参数！");
 		}
 
+		LocalDateTime now = LocalDateTime.now();
+		Integer userId = SecurityUtils.getUser().getId();
+
 		LambdaUpdateWrapper<WmTask> updateWrapper = new LambdaUpdateWrapper();
 		updateWrapper.in(WmTask::getId, ids);
 		List<WmTask> wmTaskList = list(updateWrapper);
 		updateWrapper.set(StrUtil.isNotBlank(wmTask.getTaskStatusInfo()), WmTask::getTaskStatusInfo, wmTask.getTaskStatusInfo());
+		updateWrapper.set(WmTask::getApprovalUserId, userId);
+		updateWrapper.set(WmTask::getApprovalTime, now);
 
 		String scorePackageId = wmTaskList.get(0).getScorePackageId();
 		WmScorePackage wmScorePackage = wmScorePackageService.getById(scorePackageId);
@@ -1707,7 +1712,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 
 				updateWrapper.set(WmTask::getTaskStatus, "3");
 				updateWrapper.set(WmTask::getRealFlag, "0");
-				updateWrapper.set(WmTask::getUpdateTime, LocalDateTime.now());
+				updateWrapper.set(WmTask::getUpdateTime, now);
 				this.update(updateWrapper);
 				break;
 			case "4": // 审核不通过
@@ -2570,7 +2575,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 				.set(WmTask::getTaskStatusInfo, taskStatusInfo)
 				.set(WmTask::getReviewTaskCount, 1)
 				.set(WmTask::getUpdateTime, now)
-				.set(WmTask::getUpdateUser, operatorId);
+				.set(WmTask::getUpdateUser, operatorId)
+				.set(WmTask::getApprovalUserId, operatorId)
+				.set(WmTask::getApprovalTime, now);
 		log.info("task更新参数：条件id={},updateTime={},updateUser={},更新项taskStatus={},realFlag={},taskStatusInfo={},updateTime={},updateUser={}",
 				id, queryTask.getUpdateTime(), queryTask.getUpdateUser(), taskStatus, "0", taskStatusInfo, now, operatorId);
 		boolean taskUpdate = this.update(taskUpdateWrapper);
@@ -2709,7 +2716,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 					.set(WmTask::getRealFlag, "0")
 					.set(WmTask::getTaskStatusInfo, taskStatusInfo)
 					.set(WmTask::getUpdateTime, now)
-					.set(WmTask::getUpdateUser, operatorId);
+					.set(WmTask::getUpdateUser, operatorId)
+					.set(WmTask::getApprovalUserId, operatorId)
+					.set(WmTask::getApprovalTime, now);
 			log.info("task更新参数：条件id={},updateTime={},updateUser={},更新项taskStatus={},realFlag={},taskStatusInfo={},updateTime={},updateUser={}",
 					id, queryTask.getUpdateTime(), queryTask.getUpdateUser(), taskStatus, "0", taskStatusInfo, now, operatorId);
 			boolean taskUpdate = this.update(taskUpdateWrapper);