From ff07f3bbbae77b6b32f13abf4fde5516a9cfc049 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 01 七月 2025 17:22:50 +0800 Subject: [PATCH] 工作台 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 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..26ffa5b 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,7 +154,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 +176,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