From 245e62f87e29b22b1824d5361d073acaa06ceed9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 七月 2025 11:11:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
index 26ffa5b..b4a6ab0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
@@ -16,6 +16,7 @@
import com.ruoyi.system.vo.system.AppealListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -92,7 +93,7 @@
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
sysUser.getPhonenumber().equals(query.getPhonenumber())
).map(SysUser::getUserId).collect(Collectors.toList());
- if (!query.getPatrolInspectorIds().isEmpty()){
+ if (!CollectionUtils.isEmpty(query.getPatrolInspectorIds())){
// 取交集
patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
}
@@ -161,25 +162,45 @@
appealDetailVO.setLocationIcon(byId2.getLocationIcon());
appealDetailVO.setLocationName(byId2.getLocationName());
appealDetailVO.setTaskId(byId.getId());
- SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appeal.getAuditPerson()));
- if (sysUser!=null){
- appealDetailVO.setAuditPersonName(sysUser.getUserName());
+ if (appeal.getAuditPerson()!=null){
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appeal.getAuditPerson()));
+ if (sysUser!=null){
+ appealDetailVO.setAuditPersonName(sysUser.getUserName());
+ }
}
appealDetailVO.setTaskName(byId.getTaskName());
appealDetailVO.setTaskCode(byId.getTaskCode());
return R.ok(appealDetailVO);
}
+ @Resource
+ private TNoticeService noticeService;
@Log(title = "审核申诉记录", businessType = BusinessType.UPDATE)
@ApiOperation(value = "审核申诉记录")
@PostMapping(value = "/audit")
public R<Boolean> audit(@RequestBody @Valid TAppealAuditDTO dto) {
+ TAppeal appeal = appealService.getById(dto.getId());
+ dto.setStatus(dto.getStatus());
+ dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ dto.setAuditTime(LocalDateTime.now());
+ TTask task = taskCleanService.getById(appeal.getTaskId());
+ TLocation location = locationService.getById(task.getLocationId());
+ TNotice tNotice = new TNotice();
+ tNotice.setUserId(dto.getAppealPerson());
+ tNotice.setStatus(1);
+ tNotice.setDataId(dto.getId());
dto.setAuditTime(LocalDateTime.now());
if (dto.getStatus()==2){
// 通过
TTask byId = taskCleanService.getById(dto.getTaskId());
byId.setStatus(6);
taskCleanService.updateById(byId);
+ tNotice.setNoticeType(5);
+ tNotice.setNoticeContent("【"+location.getLocationName()+"】任务申诉通过");
+ }else{
+ tNotice.setNoticeType(4);
+ tNotice.setNoticeContent("【"+location.getLocationName()+"】任务申诉驳回");
}
+ noticeService.save(tNotice);
dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
appealService.updateById(dto);
return R.ok();
--
Gitblit v1.7.1