From 8d0bd68856c69ccc2a76f54a96fdd498ce3327c7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 17:28:03 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 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 785554b..3239352 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
@@ -57,7 +57,10 @@
public class TTaskController {
@Resource
private TTaskCleanService taskCleanerService;
-
+ @Resource
+ private TNoticeService noticeService;
+ @Resource
+ private TNoticeSetService noticeSetService;
@Resource
private TTaskDetailService taskDetailService;
@@ -170,26 +173,61 @@
@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();
+ List<TTaskDetail> list = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
if (list.isEmpty()){
- byId.setStatus(6);
- taskCleanerService.updateById(byId);
+ 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{
- byId.setStatus(5);
- taskCleanerService.updateById(byId);
+ 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()+"】任务不合格,请重新上传!");
+ }
+
}
+
}
+ noticeService.save(tNotice);
dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
taskDetailService.save(dto);
return R.ok();
--
Gitblit v1.7.1