From b2e3d6532dbbb3929e01a598dcef7eb07f39b826 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 11 七月 2025 09:30:27 +0800 Subject: [PATCH] 保洁巡检本周代码 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 87 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java index cd50d37..8c12ffc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java @@ -1,10 +1,26 @@ package com.ruoyi.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.system.mapper.TAppealMapper; -import com.ruoyi.system.model.TAppeal; +import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.core.domain.BaseModel; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.applet.dto.AppealListDTO; +import com.ruoyi.system.applet.query.AppealListQuery; +import com.ruoyi.system.applet.vo.TaskListAllVO; +import com.ruoyi.system.mapper.*; +import com.ruoyi.system.model.*; +import com.ruoyi.system.query.InsepectorListQuery; import com.ruoyi.system.service.TAppealService; +import com.ruoyi.system.vo.system.AppealListVO; +import com.ruoyi.system.vo.system.InspectorListVO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Arrays; +import java.util.List; /** * <p> @@ -16,5 +32,74 @@ */ @Service public class TAppealServiceImpl extends ServiceImpl<TAppealMapper, TAppeal> implements TAppealService { + @Autowired + private TDeptMapper deptMapper; + @Autowired + private TProjectDeptMapper projectDeptMapper; + @Autowired + private TTaskDetailMapper taskDetailMapper; + @Autowired + private TTaskMapper taskMapper; + @Autowired + private SysUserMapper sysUserMapper; + @Override + public PageInfo<AppealListVO> pageList(InsepectorListQuery query) { + PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<AppealListVO> list = this.baseMapper.pageList(query,pageInfo); + List<TTask> tTasks = taskMapper.selectList(null); + List<SysUser> sysUsers = sysUserMapper.selectAllList(); + for (AppealListVO taskListVO : list) { + TTask tTask = tTasks.stream().filter(e -> e.getId().equals(taskListVO.getTaskId())).findFirst().orElse(null); + if (tTask!=null){ + SysUser sysUser = sysUsers.stream().filter(e -> e.getUserId().equals(Long.valueOf(tTask.getPatrolInspector()))).findFirst().orElse(null); + if (sysUser!=null){ + if (sysUser.getDeptType()==2){ + TDept tDept = deptMapper.selectById(tTask.getPatrolInspectorDept()); + if (tDept!=null){ + taskListVO.setDeptName(tDept.getDeptName()); + } + }else{ + TProjectDept tProjectDept = projectDeptMapper.selectById(tTask.getPatrolInspectorDept()); + if (tProjectDept!=null){ + taskListVO.setDeptName(tProjectDept.getProjectName()); + + } + } + } + } + } + pageInfo.setRecords(list); + return pageInfo; + } + + @Override + public PageInfo<AppealListVO> pageListUser(AppealListQuery query) { + PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<AppealListVO> list = this.baseMapper.pageListUser(query,pageInfo); + for (AppealListVO taskListVO : list) { + if (taskListVO.getDistance()!=null){ + taskListVO.setDistance(taskListVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN)); + }else{ + taskListVO.setDistance(new BigDecimal(0)); + } + } + pageInfo.setRecords(list); + return pageInfo; + } + + @Override + public List<TaskListAllVO> listAllTask(AppealListDTO query) { + PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<TaskListAllVO> list = this.baseMapper.listAllTask(query,pageInfo); + for (TaskListAllVO taskListAllVO : list) { + taskListAllVO.setDistance(taskListAllVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN)); + if (taskListAllVO.getStatus()==1 || taskListAllVO.getStatus()==2 ){ + taskListAllVO.setStatus(1); + }else{ + taskListAllVO.setStatus(2); + } + } + return list; + } } -- Gitblit v1.7.1