Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 22d0531ef01ace7a66a0c5cc3e313944fe2ec8b4

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

@@ -16,6 +16,7 @@
import com.ruoyi.system.vo.system.InspectorListVO;
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;
@@ -44,30 +45,37 @@
    private SysUserMapper sysUserMapper;
    @Override
    public PageInfo<AppealListVO> pageList(InsepectorListQuery query) {
        if (StringUtils.hasLength(query.getEndTime())){
            String replace = query.getEndTime().replace(" 00:00:00", " 23:59:59");
            query.setEndTime(replace);
        }
        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);
                SysUser sysUser = sysUsers.stream().filter(e -> e.getUserId().equals(Long.valueOf(taskListVO.getAppealPerson()))).findFirst().orElse(null);
                if (sysUser!=null){
                    if (sysUser.getDeptType()==2){
                        TDept tDept = deptMapper.selectById(tTask.getPatrolInspectorDept());
                        TDept tDept = deptMapper.selectById(sysUser.getDeptId());
                        if (tDept!=null){
                            taskListVO.setDeptName(tDept.getDeptName());
                        }
                    }else{
                        TProjectDept tProjectDept = projectDeptMapper.selectById(tTask.getPatrolInspectorDept());
                        if (tProjectDept!=null){
                            taskListVO.setDeptName(tProjectDept.getProjectName());

                        TProjectDept tProjectDept = projectDeptMapper.selectById(sysUser.getDeptId());
                        if (tProjectDept != null) {
                            if (!tProjectDept.getParentId().equals("0")) {
                                TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
                                if (tProjectDept1 != null) {
                                    taskListVO.setDeptName(tProjectDept1.getProjectName() + ">" + tProjectDept.getProjectName());
                                }
                            } else {
                                taskListVO.setDeptName(tProjectDept.getProjectName());
                            }
                        }
                    }
                }
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
@@ -90,6 +98,8 @@

    @Override
    public List<TaskListAllVO> listAllTask(AppealListDTO query) {
        List<TTaskDetail> tTaskDetails = taskDetailMapper.selectList(new LambdaQueryWrapper<TTaskDetail>()
                .eq(TTaskDetail::getHandleType,3).groupBy(TTaskDetail::getTaskId).orderByDesc(TTaskDetail::getCreateTime));
        PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TaskListAllVO> list = this.baseMapper.listAllTask(query,pageInfo);
        for (TaskListAllVO taskListAllVO : list) {
@@ -97,7 +107,12 @@
            if (taskListAllVO.getStatus()==1 || taskListAllVO.getStatus()==2 ){
                taskListAllVO.setStatus(1);
            }else{
                // 查询任务的驳回原因
                taskListAllVO.setStatus(2);
                TTaskDetail tTaskDetail = tTaskDetails.stream().filter(e -> e.getTaskId().equals(taskListAllVO.getId())).findFirst().orElse(null);
                if (tTaskDetail!=null){
                    taskListAllVO.setRejectRemark(tTaskDetail.getAuditRemark());
                }
            }
        }
        return list;