From f287dfb5249618bf821626e76b7ce8d8f74d6b99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 02 七月 2025 16:15:12 +0800
Subject: [PATCH] 保洁巡检本周代码

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 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 07f7e59..b6bbbfb 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
@@ -32,6 +32,7 @@
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -56,7 +57,10 @@
 public class TTaskController {
     @Resource
     private TTaskCleanService taskCleanerService;
-
+    @Resource
+    private TNoticeService noticeService;
+    @Resource
+    private TNoticeSetService noticeSetService;
     @Resource
     private TTaskDetailService taskDetailService;
 
@@ -169,26 +173,42 @@
     @Log(title = "审核任务", businessType = BusinessType.UPDATE)
     @ApiOperation(value = "审核任务")
     @PostMapping(value = "/audit")
-    public R<Boolean> audit(@RequestBody @Valid TTaskAuditDTO dto) {
+    public R<Boolean> audit(@RequestBody  TTaskAuditDTO dto) {
         dto.setAuditTime(LocalDateTime.now());
-        TTask byId = taskCleanerService.getById(dto.getTaskId());
+        TTask task = taskCleanerService.getById(dto.getTaskId());
+        TLocation location = locationService.getById(task.getLocationId());
+        TNotice tNotice = new TNotice();
+        TNoticeSet noticeSet = noticeSetService.lambdaQuery().eq(TNoticeSet::getType, 2).last("limit 1")
+                .one();
+        tNotice.setUserId(task.getPatrolInspector());
+        tNotice.setStatus(1);
+        tNotice.setDataId(task.getId());
+        tNotice.setNoticeSetType(noticeSet.getNoticeType());
         if (dto.getAuditStatus()==2){
             dto.setHandleType(3);
             // 将任务修改为待整改
-            byId.setStatus(4);
-            taskCleanerService.updateById(byId);
+            task.setStatus(4);
+            taskCleanerService.updateById(task);
+            // 增加消息
+            tNotice.setNoticeType(1);
+            tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
+
         }else{
             dto.setHandleType(2);
             // 如果是初次审核就通过 将状态设置为已完成
             List<TTaskDetail> list = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
             if (list.isEmpty()){
-                byId.setStatus(6);
-                taskCleanerService.updateById(byId);
+                task.setStatus(6);
+                taskCleanerService.updateById(task);
             }else{
-                byId.setStatus(5);
-                taskCleanerService.updateById(byId);
+                task.setStatus(5);
+                taskCleanerService.updateById(task);
             }
+            // 增加消息
+            tNotice.setNoticeType(2);
+            tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
         }
+        noticeService.save(tNotice);
         dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
         taskDetailService.save(dto);
         return R.ok();
@@ -196,7 +216,7 @@
     @Log(title = "批量审核任务", businessType = BusinessType.UPDATE)
     @ApiOperation(value = "批量审核任务")
     @PostMapping(value = "/auditBatch")
-    public R<Boolean> auditBatch(@RequestBody @Valid TTaskAuditBatchDTO dto) {
+    public R<Boolean> auditBatch(@RequestBody @Validated TTaskAuditBatchDTO dto) {
         List<TTaskDetail> tTaskDetails = new ArrayList<>();
         for (String s : dto.getTaskIds().split(",")) {
             TTask byId = taskCleanerService.getById(s);
@@ -317,7 +337,7 @@
         return R.ok();
     }
 
-    @Log(title = "任务记录导出", businessType = BusinessType.DELETE)
+    @Log(title = "任务记录导出", businessType = BusinessType.EXPORT)
     @ApiOperation(value = "任务记录导出")
     @PostMapping(value = "/exportExcel")
     public void exportExcel(@RequestBody TaskListQuery query) {

--
Gitblit v1.7.1