From 6a9685e29ff409516a1ad078eaacadaf73843f9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 13:57:22 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 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 f76ad96..463f62a 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
@@ -3,21 +3,17 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TAppealAuditDTO;
-import com.ruoyi.system.dto.TTaskAuditDTO;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.InsepectorListQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.system.AppealDetailVO;
import com.ruoyi.system.vo.system.AppealListVO;
-import com.ruoyi.system.vo.system.InspectorListVO;
-import com.ruoyi.system.vo.system.TaskDetailVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.StringUtils;
@@ -43,34 +39,28 @@
@RequestMapping("/t-appeal")
public class TAppealController {
@Resource
- private TTaskService taskService;
+ private TTaskCleanService taskCleanService;
- @Resource
- private TTaskDetailService taskDetailService;
+
@Resource
private TLocationTypeService locationTypeService;
@Resource
private TLocationService locationService;
- @Resource
- private TProjectDeptService projectDeptService;
- @Resource
- private TCleanerService cleanerService;
- @Resource
- private TTaskService tTaskService;
+
@Resource
private TTaskDetailService tTaskDetailService;
+ @Resource
+ private TProjectDeptService projectDeptService;
@Resource
private TDeptService deptService;
@Resource
private ISysUserService sysUserService;
- @Resource
- private TDictDataService dictDataService;
+
@Resource
private TokenService tokenService;
- @Resource
- private TInspectorService inspectorService;
+
@Resource
private TAppealService appealService;
@ApiOperation(value = "申诉记录分页列表")
@@ -164,32 +154,49 @@
AppealDetailVO appealDetailVO = new AppealDetailVO();
TAppeal appeal = appealService.getById(id);
BeanUtils.copyProperties(appeal,appealDetailVO);
- TTask byId = taskService.getById(appeal.getTaskId());
+ TTask byId = taskCleanService.getById(appeal.getTaskId());
TLocation byId1 = locationService.getById(byId.getLocationId());
TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
appealDetailVO.setLocationAddress(byId1.getLocationAddress());
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());
+ 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 = taskService.getById(dto.getTaskId());
+ TTask byId = taskCleanService.getById(dto.getTaskId());
byId.setStatus(6);
- taskService.updateById(byId);
+ 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