From ead0a2f837503380c26f008338ac9ce026680e47 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 17 六月 2025 15:21:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 9781920..6a7144f 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
@@ -151,14 +151,23 @@
@PostMapping(value = "/audit")
public R<Boolean> audit(@RequestBody @Valid TTaskAuditDTO dto) {
dto.setAuditTime(LocalDateTime.now());
+ TTask byId = taskCleanerService.getById(dto.getTaskId());
if (dto.getAuditStatus()==2){
dto.setHandleType(3);
// 将任务修改为待整改
- TTask byId = taskCleanerService.getById(dto.getTaskId());
byId.setStatus(4);
taskCleanerService.updateById(byId);
}else{
dto.setHandleType(2);
+ // 如果是初次审核就通过 将状态设置为已完成
+ List<TTaskDetail> list = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
+ if (list.isEmpty()){
+ byId.setStatus(6);
+ taskCleanerService.updateById(byId);
+ }else{
+ byId.setStatus(5);
+ taskCleanerService.updateById(byId);
+ }
}
dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
taskDetailService.save(dto);
@@ -170,6 +179,7 @@
public R<Boolean> auditBatch(@RequestBody @Valid TTaskAuditBatchDTO dto) {
List<TTaskDetail> tTaskDetails = new ArrayList<>();
for (String s : dto.getTaskIds().split(",")) {
+ TTask byId = taskCleanerService.getById(s);
TTaskDetail tTaskDetail = new TTaskDetail();
tTaskDetail.setTaskId(s);
tTaskDetail.setAuditTime(LocalDateTime.now());
@@ -177,11 +187,19 @@
if (dto.getAuditStatus()==2){
tTaskDetail.setHandleType(3);
// 将任务修改为待整改
- TTask byId = taskCleanerService.getById(tTaskDetail.getTaskId());
byId.setStatus(4);
taskCleanerService.updateById(byId);
}else{
tTaskDetail.setHandleType(2);
+ // 如果是初次审核就通过 将状态设置为已完成
+ List<TTaskDetail> list = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, s).list();
+ if (list.isEmpty()){
+ byId.setStatus(6);
+ taskCleanerService.updateById(byId);
+ }else{
+ byId.setStatus(5);
+ taskCleanerService.updateById(byId);
+ }
}
tTaskDetails.add(tTaskDetail);
}
--
Gitblit v1.7.1