保洁巡检本周代码

无关风月

2025-06-30 7c1bbfb67b710ab6f2f9a931415b98f303ff384b

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java

@@ -4,16 +4,22 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.system.mapper.TDeptMapper;
import com.ruoyi.system.mapper.TTaskDetailMapper;
import com.ruoyi.system.mapper.TTaskMapper;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.applet.query.TaskUserListQuery;
import com.ruoyi.system.applet.vo.TaskUserListVO;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TaskListQuery;
import com.ruoyi.system.query.TaskProgressQuery;
import com.ruoyi.system.service.TTaskCleanService;
import com.ruoyi.system.vo.system.ProgressListVO;
import com.ruoyi.system.vo.system.TaskListVO;
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;

@@ -33,10 +39,60 @@
    private TDeptMapper deptMapper;
    @Autowired
    private TTaskDetailMapper taskDetailMapper;
    @Autowired
    private SysUserMapper sysUserMapper;
    @Autowired
    private TProjectDeptMapper projectDeptMapper;

    @Override
    public PageInfo<TaskListVO> pageList(TaskListQuery query) {
        PageInfo<TaskListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TaskListVO> list = this.baseMapper.pageList(query,pageInfo);

        List<TTaskDetail> tTaskDetails = taskDetailMapper.selectList(new LambdaQueryWrapper<TTaskDetail>()
                .orderByDesc(BaseModel::getCreateTime)
                .in(TTaskDetail::getHandleType,Arrays.asList(1,4)));

        for (TaskListVO temp : list) {
            SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(temp.getPatrolInspector()));
            if(sysUser!=null){
                if ( sysUser.getDeptType() == 1){
                    TProjectDept tProjectDept = projectDeptMapper.selectById(sysUser.getDeptId());
                    if (!tProjectDept.getParentId().equals("0")){
                        TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
                        temp.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
                    }else{
                        temp.setDeptName(tProjectDept.getProjectName());
                    }
                }else{
                    TDept tDept = deptMapper.selectById(sysUser.getDeptId());
                    temp.setDeptName(tDept.getDeptName());
                }
            }
            TTaskDetail tTaskDetail = tTaskDetails.stream().filter(e -> e.getTaskId().equals(temp.getId())).findFirst().orElse(null);
            if (tTaskDetail!=null){
                temp.setPicture(tTaskDetail.getPicture());
                temp.setClearStatus(tTaskDetail.getClearStatus());
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public PageInfo<TaskUserListVO> pageListUser(TaskUserListQuery query) {
        PageInfo<TaskUserListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TaskUserListVO> list = this.baseMapper.pageListUser(query,pageInfo);
        for (TaskUserListVO taskUserListVO : list) {
            taskUserListVO.setDistance(taskUserListVO.getDistance().divide(new BigDecimal("1000"),2, RoundingMode.HALF_UP));
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<TaskListVO> exportList(TaskListQuery query) {
        List<TaskListVO> list = this.baseMapper.exportList(query);

        List<TTaskDetail> tTaskDetails = taskDetailMapper.selectList(new LambdaQueryWrapper<TTaskDetail>()
                .orderByDesc(BaseModel::getCreateTime)
@@ -49,9 +105,27 @@
            if (tTaskDetail!=null){
                taskListVO.setPicture(tTaskDetail.getPicture());
                taskListVO.setClearStatus(tTaskDetail.getClearStatus());
                taskListVO.setFinishTimeStr(DateUtils.localDateTimeToString(tTaskDetail.getCreateTime()));
                taskListVO.setRemark(tTaskDetail.getRemark());
            }
        }
        return list;
    }

    @Override
    public PageInfo<ProgressListVO> taskProgress(TaskProgressQuery query) {
        PageInfo<ProgressListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<ProgressListVO> list = this.baseMapper.taskProgress(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<ProgressListVO> taskProgressExport(TaskProgressQuery query) {
        List<ProgressListVO> list = this.baseMapper.taskProgressExport(query);

        return list;
    }


}