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

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

@@ -1463,7 +1463,22 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		}
 		wmTask.setDelFlag("0");
 		wmTask.setRealFlag("0");
-		return R.ok(wmTaskMapper.getWmTaskList(page, wmTask));
+
+		IPage<WmTask> taskPage = wmTaskMapper.getWmTaskList(page, wmTask);
+		if (CollUtil.isNotEmpty(taskPage.getRecords())) {
+			Set<Integer> approvalUserIds = taskPage.getRecords().stream()
+					.filter(r -> r.getApprovalUserId() != null)
+					.map(WmTask::getApprovalUserId).collect(Collectors.toSet());
+			if (CollUtil.isNotEmpty(approvalUserIds)) {
+				List<SysUser> users = userService.listByIds(approvalUserIds);
+				Map<Integer, String> userMap = users.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname));
+				taskPage.getRecords().stream()
+						.filter(r -> r.getApprovalUserId() != null)
+						.forEach(r -> r.setApprovalUserName(userMap.get(r.getApprovalUserId())));
+			}
+		}
+
+		return R.ok();
 	}
 
 	// /**

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -76,6 +76,10 @@
 		<result property="taskFrom" column="task_from"/>
 		<result property="reviewTaskCount" column="review_task_count"/>
 		<result property="deptReviewTaskCount" column="dept_review_task_count"/>
+		<result property="approvalUserId" column="approval_user_id"/>
+		<result property="approvalTime" column="approval_time"/>
+		<result property="deptApprovalUserId" column="dept_approval_user_id"/>
+		<result property="deptApprovalTime" column="dept_approval_time"/>
 
 	</resultMap>
 
@@ -980,7 +984,11 @@
 		t.report_drug_id,
 		t.report_one_id,
 		t.report_second_id,
-		t.task_status_info
+		t.task_status_info,
+		t.approval_user_id,
+		t.approval_time,
+		t.dept_approval_user_id,
+		t.dept_approval_time
 		FROM wm_task t
 		left join sys_user u on  u.user_id=t.task_user_id
 		left join sys_dept d on d.dept_id=t.dept_id
@@ -1105,7 +1113,11 @@
 		t.submit_status AS submit_status,
 		t.share_img_url AS share_img_url,
 		t.plat_audit_status AS plat_audit_status,
-		t.task_info_img AS task_info_img
+		t.task_info_img AS task_info_img,
+		t.approval_user_id,
+		t.approval_time,
+		t.dept_approval_user_id,
+		t.dept_approval_time
 		FROM wm_task t
 		left join sys_user u on  u.user_id=t.task_user_id
 		left join sys_dept d on d.dept_id=t.dept_id