From bcfbba254d346d1d2a97703069bdaa3a4fb3a6df Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 13 六月 2025 10:19:56 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 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..a8592e2 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,10 +39,9 @@
@RequestMapping("/t-appeal")
public class TAppealController {
@Resource
- private TTaskService taskService;
+ private TTaskCleanService taskCleanService;
- @Resource
- private TTaskDetailService taskDetailService;
+
@Resource
@@ -56,21 +51,15 @@
@Resource
private TProjectDeptService projectDeptService;
@Resource
- private TCleanerService cleanerService;
- @Resource
- private TTaskService tTaskService;
- @Resource
private TTaskDetailService tTaskDetailService;
@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,7 +153,7 @@
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());
@@ -186,9 +175,9 @@
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);
}
dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
appealService.updateById(dto);
--
Gitblit v1.7.1