Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 653cb0ed3e7be231059480cee266b11f1c9ba11e

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

@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
@@ -10,13 +11,16 @@
import com.ruoyi.system.applet.vo.TaskUserListVO;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.PointDetailQuery;
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.TLocationTaskListVO;
import com.ruoyi.system.vo.system.TaskListVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -87,7 +91,12 @@
        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));

            if (taskUserListVO.getDistance()!=null){
                taskUserListVO.setDistance(taskUserListVO.getDistance().divide(new BigDecimal("1000"),2, RoundingMode.HALF_DOWN));
            }else{
                taskUserListVO.setDistance(new BigDecimal("0"));
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
@@ -130,5 +139,28 @@
        return list;
    }

    @Override
    public PageInfo<TLocationTaskListVO> pointInspectionHeatDetailTaskList(PointDetailQuery query) {
        PageInfo<TLocationTaskListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TLocationTaskListVO> list = this.baseMapper.pointInspectionHeatDetailTaskList(query,pageInfo);

        List<TDept> deptList = deptMapper.selectList(Wrappers.lambdaQuery(TDept.class));
        List<TProjectDept> projectDeptList = projectDeptMapper.selectList(Wrappers.lambdaQuery(TProjectDept.class));

        for (TLocationTaskListVO tLocationTaskListVO : list) {
            if(tLocationTaskListVO.getDeptType()==1){
                projectDeptList.stream().filter(e -> e.getId().equals(tLocationTaskListVO.getDeptId())).findFirst().ifPresent(e -> {
                    tLocationTaskListVO.setDeptName(e.getProjectName());
                });
            }else {
                deptList.stream().filter(e -> e.getId().equals(tLocationTaskListVO.getDeptId())).findFirst().ifPresent(e -> {
                    tLocationTaskListVO.setDeptName(e.getDeptName());
                });
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }


}