From 8ea3b11f54ea9b56f295eeed04eb869e7f67bd16 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 七月 2025 21:33:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
index 3239352..74d5f09 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
@@ -176,6 +176,9 @@
public R<Boolean> audit(@RequestBody TTaskAuditDTO dto) {
dto.setAuditTime(LocalDateTime.now());
TTask task = taskCleanerService.getById(dto.getTaskId());
+ TTaskDetail one = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId())
+ .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();
+ dto.setClearStatus(one.getClearStatus());
TLocation location = locationService.getById(task.getLocationId());
TNotice tNotice = new TNotice();
TNoticeSet noticeSet = noticeSetService.lambdaQuery().eq(TNoticeSet::getType, 2).last("limit 1")
@@ -230,6 +233,11 @@
noticeService.save(tNotice);
dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
taskDetailService.save(dto);
+ one.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ one.setAuditTime(LocalDateTime.now());
+ one.setAuditRemark(dto.getAuditRemark());
+ one.setAuditStatus(dto.getAuditStatus());
+ taskDetailService.updateById(one);
return R.ok();
}
@Log(title = "批量审核任务", businessType = BusinessType.UPDATE)
@@ -340,9 +348,11 @@
byId4.setUnqualifiedName(byId3.getDataContent());
}
}
- SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
- if (sysUser!=null){
- byId4.setAuditPersonName(sysUser.getUserName());
+ if (byId4.getAuditPerson()!=null){
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
+ if (sysUser!=null){
+ byId4.setAuditPersonName(sysUser.getUserName());
+ }
}
taskDetailVO.setTaskDetail(byId4);
return R.ok(taskDetailVO);
--
Gitblit v1.7.1