From 53d014edd19f57125c355abe71ec5b478500e610 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 09:57:40 +0800
Subject: [PATCH] 保洁巡检所有代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 87fa67d..9a63bbd 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
@@ -30,6 +30,7 @@
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TaskListQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.utils.TemplateMessageSendUtil;
import com.ruoyi.system.vo.system.*;
import com.ruoyi.web.controller.tool.EmailUtils;
import com.ruoyi.web.controller.tool.MsgUtils;
@@ -199,12 +200,15 @@
private TNoticeSetService noticeSetService;
@Resource
private TDictDataService dictDataService;
+ @Resource
+ private TemplateMessageSendUtil templateMessageSendUtil;
@Log(title = "审核任务", businessType = BusinessType.UPDATE)
@ApiOperation(value = "审核任务")
@PostMapping(value = "/audit")
public R<Boolean> audit(@RequestBody TTaskAuditDTO dto) throws Exception {
dto.setAuditTime(LocalDateTime.now());
TTask task = taskCleanerService.getById(dto.getTaskId());
+ SysUser auditPerson = sysUserService.selectUserById(tokenService.getLoginUser().getUserId());
SysUser sysUser = sysUserService.selectUserById(Long.valueOf(task.getPatrolInspector()));
TTaskDetail one = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId())
@@ -258,17 +262,26 @@
// 增加消息
tNotice.setNoticeType(1);
tNotice.setNoticeContent("【" + location.getLocationName() + "】任务不合格,请重新上传!");
+
if (sysUser!=null){
+
+
switch (noticeSet.getNoticeType()) {
case 1:
msgUtils.sendMsg1(sysUser.getPhonenumber(),location.getLocationName(),"驳回");
break;
case 2:
- if (StringUtils.hasLength(email.getDataContent())&&StringUtils.hasLength(code.getDataContent())){
+ if (StringUtils.hasLength(email.getDataContent())&&StringUtils.hasLength(code.getDataContent())
+
+ &&StringUtils.hasLength(sysUser.getEmail())){
EmailUtils.sendEmail(sysUser.getEmail(),email.getDataContent(),code.getDataContent(),"【" + location.getLocationName() + "】任务不合格,请重新上传!");
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ templateMessageSendUtil.wxTemplateTaskResultRequest(sysUser.getOpenId(),
+ location.getLocationName(),"驳回",auditPerson.getNickName());
+ }
break;
}
@@ -328,11 +341,16 @@
msgUtils.sendMsg1(sysUser.getPhonenumber(),location.getLocationName(),"通过");
break;
case 2:
- if (StringUtils.hasLength(email.getDataContent())&&StringUtils.hasLength(code.getDataContent())){
+ if (StringUtils.hasLength(email.getDataContent())&&StringUtils.hasLength(code.getDataContent())
+ &&StringUtils.hasLength(sysUser.getEmail())){
EmailUtils.sendEmail(sysUser.getEmail(),email.getDataContent(),code.getDataContent(),"【" + location.getLocationName() + "】任务已通过");
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ templateMessageSendUtil.wxTemplateTaskResultRequest(sysUser.getOpenId(),
+ location.getLocationName(),"驳回",auditPerson.getNickName());
+ }
break;
}
}
@@ -357,6 +375,8 @@
List<TTaskDetail> tTaskDetails = new ArrayList<>();
List<TLocation> locations = locationService.list();
List<SysUser> sysUsers = sysUserService.selectAllList();
+ SysUser auditPerson = sysUserService.selectUserById(tokenService.getLoginUser().getUserId());
+
List<TTaskDetail> taskDetails = taskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)
.in(TTaskDetail::getTaskId, Arrays.asList(dto.getTaskIds().split(",")))
.eq(TTaskDetail::getHandleType,1)
@@ -460,7 +480,8 @@
msgUtils.sendMsg1(sysUser.getPhonenumber(),location.getLocationName(),"驳回");
break;
case 2:
- if (StringUtils.hasLength(email.getDataContent())&&StringUtils.hasLength(code.getDataContent())){
+ if (StringUtils.hasLength(email.getDataContent())&&StringUtils.hasLength(code.getDataContent())
+ &&StringUtils.hasLength(sysUser.getEmail())){
EmailUtils.sendEmail(sysUser.getEmail(),email.getDataContent(),code.getDataContent(),"【" + location.getLocationName() + "】任务不合格,请重新上传!");
}
break;
@@ -522,11 +543,16 @@
msgUtils.sendMsg1(sysUser.getPhonenumber(),location.getLocationName(),"通过");
break;
case 2:
- if (StringUtils.hasLength(email.getDataContent())&&StringUtils.hasLength(code.getDataContent())){
+ if (StringUtils.hasLength(email.getDataContent())&&StringUtils.hasLength(code.getDataContent())
+ &&StringUtils.hasLength(sysUser.getEmail())){
EmailUtils.sendEmail(sysUser.getEmail(),email.getDataContent(),code.getDataContent(),"【" + location.getLocationName() + "】任务已通过");
}
break;
case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())){
+ templateMessageSendUtil.wxTemplateTaskResultRequest(sysUser.getOpenId(),
+ location.getLocationName(),"驳回",auditPerson.getNickName());
+ }
break;
}
}
--
Gitblit v1.7.1