From 083c414ff683ab12e65069c6c0ba6871ed1ed09f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 10:19:09 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java
index 8bb4677..432bf53 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
@@ -11,14 +12,8 @@
import com.ruoyi.system.applet.dto.AppealDTO;
import com.ruoyi.system.dto.TTaskAuditBatchDTO;
import com.ruoyi.system.dto.TaskDetailDto;
-import com.ruoyi.system.model.TAppeal;
-import com.ruoyi.system.model.TLocation;
-import com.ruoyi.system.model.TTask;
-import com.ruoyi.system.model.TTaskDetail;
-import com.ruoyi.system.service.TAppealService;
-import com.ruoyi.system.service.TLocationService;
-import com.ruoyi.system.service.TTaskCleanService;
-import com.ruoyi.system.service.TTaskDetailService;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.service.*;
import com.ruoyi.web.controller.tool.AmapApiClient;
import com.ruoyi.web.controller.tool.GeoChecker;
import com.ruoyi.web.controller.tool.PathParser;
@@ -37,6 +32,7 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -59,6 +55,8 @@
private TAppealService appealService;
@Autowired
private TLocationService locationService;
+ @Resource
+ private TInspectorService inspectorService;
@ApiOperation(value = "上传任务")
@PostMapping(value = "/uploadTask")
@@ -69,7 +67,23 @@
if (task==null)return R.fail("任务不存在");
TLocation location = locationService.getById(task.getLocationId());
if (location==null)return R.fail("点位不存在");
-// try {
+ TInspector byId = inspectorService.getById(dto.getId());
+ if (byId!=null){
+ UpdateWrapper<TInspector> tInspectorUpdateWrapper = new UpdateWrapper<>();
+ tInspectorUpdateWrapper.set("clear_status", dto.getClearStatus());
+ tInspectorUpdateWrapper.set("unqualified", dto.getUnqualified());
+ tInspectorUpdateWrapper.set("remark", dto.getRemark());
+ tInspectorUpdateWrapper.set("picture", dto.getPicture());
+ tInspectorUpdateWrapper.set("audio_url", dto.getAudioUrl());
+ tInspectorUpdateWrapper.set("status", 1);
+ tInspectorUpdateWrapper.set("audit_time", 1);
+ tInspectorUpdateWrapper.set("audit_person", 1);
+ tInspectorUpdateWrapper.set("audit_status", 1);
+ tInspectorUpdateWrapper.set("audit_remark", 1);
+ tInspectorUpdateWrapper.eq("id", dto.getId());
+ inspectorService.update(tInspectorUpdateWrapper);
+ }else{
+ // try {
// String routeJson = AmapApiClient.getDrivingRoute(Double.parseDouble(location.getLocationLat()),
// Double.parseDouble(location.getLocationLon()),
// Double.parseDouble(location.getLocationLatEnd()),
@@ -97,9 +111,11 @@
// } catch (Exception e) {
// e.printStackTrace();
// }
- taskDetailService.save(dto);
- // 修改任务状态
- taskService.update(Wrappers.<TTask>lambdaUpdate().set(TTask::getStatus, 3).eq(TTask::getId, dto.getTaskId()));
+ taskDetailService.save(dto);
+ // 修改任务状态
+ taskService.update(Wrappers.<TTask>lambdaUpdate().set(TTask::getStatus, 3).eq(TTask::getId, dto.getTaskId()));
+ }
+
return R.ok();
}
@@ -114,10 +130,28 @@
}
dto.setAppealPerson(tokenService.getLoginUserApplet().getUserId()+"");
appealService.save(dto);
+ List<TTaskDetail> taskDetails = taskDetailService.lambdaQuery()
+ .eq(TTaskDetail::getTaskId, dto.getTaskId())
+ .eq(TTaskDetail::getAuditStatus, 1)
+ .eq(TTaskDetail::getHandleType,1)
+ .isNotNull(TTaskDetail::getClearStatus)
+ .orderByDesc(TTaskDetail::getCreateTime).list();
+ // 使用 stream 去重，保留每个 taskId 最新的一条
+ taskDetails = new ArrayList<>(taskDetails.stream()
+ .collect(Collectors.groupingBy(
+ TTaskDetail::getTaskId,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ listAll -> listAll.get(0)
+ )
+ ))
+ .values());
// 添加任务详情
TTaskDetail taskDetail = new TTaskDetail();
taskDetail.setTaskId(dto.getTaskId());
taskDetail.setHandleType(4);
+ taskDetail.setClearStatus(taskDetail.getClearStatus());
+ taskDetail.setAppealId(dto.getId());
taskDetailService.save(taskDetail);
return R.ok();
}
--
Gitblit v1.7.1