From 245e62f87e29b22b1824d5361d073acaa06ceed9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 七月 2025 11:11:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 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 74d5f09..5bcbb49 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
@@ -201,34 +201,16 @@
// 如果是初次审核就通过 将状态设置为已完成
List<TTaskDetail> list = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
if (list.isEmpty()){
- if (dto.getClearStatus()==1){
task.setStatus(6);
taskCleanerService.updateById(task);
- }else{
- task.setStatus(4);
- taskCleanerService.updateById(task);
-// 增加消息
- tNotice.setNoticeType(1);
- tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
- }
-
- }else{
- if (dto.getClearStatus()==1){
- task.setStatus(5);
- taskCleanerService.updateById(task);
- // 增加消息
tNotice.setNoticeType(2);
tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
- }else{
- task.setStatus(4);
- taskCleanerService.updateById(task);
- // 增加消息
- tNotice.setNoticeType(1);
- tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
- }
-
+ }else{
+ task.setStatus(5);
+ taskCleanerService.updateById(task);
+ tNotice.setNoticeType(2);
+ tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
}
-
}
noticeService.save(tNotice);
dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
--
Gitblit v1.7.1