From 083c414ff683ab12e65069c6c0ba6871ed1ed09f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 10:19:09 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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 a5d7f36..c20d223 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
@@ -35,6 +35,7 @@
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import oshi.driver.mac.net.NetStat;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
@@ -62,6 +63,8 @@
private TNoticeService noticeService;
@Resource
private TNoticeSetService noticeSetService;
+ @Resource
+ private TEarlyWarningService earlyWarningService;
@Resource
private TTaskDetailService taskDetailService;
@@ -100,6 +103,7 @@
List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
.stream().map(TProjectDept::getId).collect(Collectors.toList());
listIds.addAll(collect);
+ listIds.add(tProjectDept.getId());
}
}
List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
@@ -204,6 +208,21 @@
tNotice.setDataId(task.getId());
tNotice.setNoticeSetType(noticeSet.getNoticeType());
if (dto.getAuditStatus()==2){
+ if (StringUtils.hasLength(location.getUnqualifiedTaskId())){
+ if (location.getUnqualifiedTaskId().split(",").length==2){
+ // 已经两条不合格了 生成点位不合格预警记录
+ location.setUnqualifiedTaskId(location.getUnqualifiedTaskId()+","+dto.getTaskId());
+ TEarlyWarning tEarlyWarning = new TEarlyWarning();
+ tEarlyWarning.setWarningType(2);
+ tEarlyWarning.setTaskId(location.getUnqualifiedTaskId());
+ earlyWarningService.save(tEarlyWarning);
+ location.setUnqualifiedTaskId("");
+ locationService.updateById(location);
+ }
+ }else{
+ location.setUnqualifiedTaskId(dto.getTaskId());
+ locationService.updateById(location);
+ }
dto.setHandleType(3);
// 将任务修改为待整改
task.setStatus(4);
@@ -211,9 +230,24 @@
// 增加消息
tNotice.setNoticeType(1);
tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
-
}else{
-
+ if (dto.getClearStatus()==2){
+ if (StringUtils.hasLength(location.getUnqualifiedTaskId())){
+ if (location.getUnqualifiedTaskId().split(",").length==2){
+ // 已经两条不合格了 生成点位不合格预警记录
+ location.setUnqualifiedTaskId(location.getUnqualifiedTaskId()+","+dto.getTaskId());
+ TEarlyWarning tEarlyWarning = new TEarlyWarning();
+ tEarlyWarning.setWarningType(2);
+ tEarlyWarning.setTaskId(location.getUnqualifiedTaskId());
+ earlyWarningService.save(tEarlyWarning);
+ location.setUnqualifiedTaskId("");
+ locationService.updateById(location);
+ }
+ }else{
+ location.setUnqualifiedTaskId(dto.getTaskId());
+ locationService.updateById(location);
+ }
+ }
dto.setHandleType(2);
// 如果是初次审核就通过 将状态设置为已完成
List<TTaskDetail> list = tTaskDetailService.lambdaQuery()
--
Gitblit v1.7.1