Merge remote-tracking branch 'origin/master'

xuhy

昨天 1dfb91db022f6cfa4bcb9d953ca9aa8a503e1ca5

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java

@@ -239,18 +239,31 @@
        List<TTaskDetail> taskDetails = taskDetailService.lambdaQuery()
                .in(TTaskDetail::getTaskId, taskIds)
                .eq(TTaskDetail::getAuditStatus, 1)

                .eq(TTaskDetail::getHandleType,1)
                .isNotNull(TTaskDetail::getClearStatus)
                .groupBy(TTaskDetail::getTaskId)
                .orderByDesc(TTaskDetail::getCreateTime).list();
        // 使用 stream 去重，保留每个 taskId 最新的一条
        taskDetails = new ArrayList<>(taskDetails.stream()
                .collect(Collectors.groupingBy(
                        TTaskDetail::getTaskId,
                        Collectors.collectingAndThen(
                                Collectors.toList(),
                                listAll -> listAll.get(0)
                        )
                ))
                .values());

        int size = (int) finishTask.stream().filter(e -> e.getStatus() == 5 || e.getStatus() == 6).count();
        List<String> taskIdsStatus = finishTask.stream().map(TTask::getId).collect(Collectors.toList());
        if (taskIdsStatus.isEmpty()){
            taskIdsStatus.add("-1");
        }
        userIndexVO.setFinishCount(size);
        List<TTaskDetail> status1 = taskDetails.stream().filter(e -> e.getClearStatus() == 1).collect(Collectors.toList());
        List<TTaskDetail> status2 = taskDetails.stream().filter(e -> e.getClearStatus() == 2).collect(Collectors.toList());
        List<TTaskDetail> status1 = taskDetails.stream().filter(e -> e.getClearStatus() == 1&&taskIdsStatus.contains(e.getTaskId())).collect(Collectors.toList());
        List<TTaskDetail> status2 = taskDetails.stream().filter(e -> e.getClearStatus() == 2&&taskIdsStatus.contains(e.getTaskId())).collect(Collectors.toList());
        if (!status1.isEmpty()) {
            BigDecimal divide = new BigDecimal(status1.size() + status2.size())
                    .divide(new BigDecimal(status1.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
            BigDecimal divide = new BigDecimal(status1.size())
                    .divide(new BigDecimal(status1.size()+status2.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
            userIndexVO.setRate(divide);
        } else {
            userIndexVO.setRate(new BigDecimal(0));
@@ -267,11 +280,7 @@
        if (taskIdsRank.isEmpty()){
            userIndexVO.setRanking(0);
        }else{
            List<TTaskDetail> taskDetailsRank = taskDetailService.lambdaQuery().in(TTaskDetail::getTaskId)
                    .eq(TTaskDetail::getAuditStatus, 1)
                    .isNotNull(TTaskDetail::getClearStatus)
                    .groupBy(TTaskDetail::getTaskId)
                    .orderByDesc(TTaskDetail::getCreateTime).list();

            for (SysUser user : users) {
                int finishCount = (int) taskRank.stream().filter(e->e.getPatrolInspector().equals(user.getUserId()+"")&&e.getStatus() == 5 || e.getStatus() == 6).count();
                int totalCount = (int) taskRank.stream().filter(e->e.getPatrolInspector().equals(user.getUserId()+"")).count();
@@ -333,19 +342,30 @@
        taskDetailVO.setLocationAddressEnd(byId1.getLocationAddressEnd());
        taskDetailVO.setLocationIcon(byId2.getLocationIcon());
        taskDetailVO.setLocationTypeName(byId2.getLocationName());
        taskDetailVO.setLocationLon(byId1.getLocationLon());
        taskDetailVO.setLocationLat(byId1.getLocationLat());
        taskDetailVO.setLocationLatEnd(byId1.getLocationLatEnd());
        taskDetailVO.setLocationLonEnd(byId1.getLocationLonEnd());
        TTaskDetail tTaskDetail = list.stream().filter(e -> e.getHandleType() == 1).findFirst().orElse(null);
        TTaskDetail tTaskDetailFinish = list.stream().filter(e -> e.getHandleType() == 2).findFirst().orElse(null);
        if (tTaskDetail != null && tTaskDetail.getUnqualified() != null) {
            TDictData byId3 = dictDataService.getById(tTaskDetail.getUnqualified());
            if (byId3 != null) {
                tTaskDetail.setUnqualifiedName(byId3.getDataContent());
            }
        }
        if (tTaskDetailFinish != null) {
            tTaskDetailFinish.setFinishTime(tTaskDetailFinish.getCreateTime());
        if (tTaskDetail != null) {
            tTaskDetail.setFinishTime(tTaskDetail.getCreateTime());
        }
        taskDetailVO.setTaskDetail(tTaskDetail);
        taskDetailVO.setRecords(list);
        if (byId.getStatus()==4){
            TTaskDetail reject = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, id)
                    .eq(TTaskDetail::getHandleType,3)
                    .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();
            if (reject!=null){
                taskDetailVO.setRejectRemark(reject.getAuditRemark());
            }
        }
        return R.ok(taskDetailVO);
    }

@@ -367,6 +387,7 @@
                byId4.setUnqualifiedName(byId3.getDataContent());
            }
        }
        byId4.setFinishTime(byId4.getCreateTime());
        SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
        if (sysUser != null) {
            byId4.setAuditPersonName(sysUser.getUserName());
@@ -393,8 +414,9 @@
        TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
        appealDetailVO.setLocationAddress(byId1.getLocationAddress());
        appealDetailVO.setLocationIcon(byId2.getLocationIcon());
        appealDetailVO.setLocationName(byId2.getLocationName());
        appealDetailVO.setLocationName(byId1.getLocationName());
        appealDetailVO.setTaskId(byId.getId());
        appealDetailVO.setLocationTypeName(byId2.getLocationName());
        if (StringUtils.hasLength(appeal.getAuditPerson())) {
            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appeal.getAuditPerson()));
            if (sysUser != null) {
@@ -420,6 +442,11 @@
    @PostMapping(value = "/listAllTask")
    public R<List<TaskListAllVO>> listAllTask(@RequestBody AppealListDTO appealListDTO) {
        appealListDTO.setUserId(tokenService.getLoginUserApplet().getUserId() + "");
        SysUser sysUser = sysUserService.selectUserById(tokenService.getLoginUserApplet().getUserId());
        if (sysUser.getDeptType()==2){
            // 公司部门查询所有任务
            appealListDTO.setUserId(null);
        }
        List<TaskListAllVO> res = appealService.listAllTask(appealListDTO);
        return R.ok(res);
    }
@@ -516,6 +543,8 @@
        SysRole sysRole = roleService.selectRoleById(userRole);
        List<SysUser> sysUsers = sysUserService.selectAllList();
        SysUser auditPerson = sysUserService.selectUserById(999L);

        List<TProjectDept> paojectList = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, "0").list();
        //项目部负责人、部门负责人、公司成员提交由最终审批人审批；
        if (user.getDeptType() == 2 || sysRole.getRoleName().contains("项目部负责人") || sysRole.getRoleName().contains("部门负责人")) {
            LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
@@ -525,19 +554,45 @@
            res.setAuditPersonId("999");
        } else if (!sysRole.getRoleName().equals("部门助理")) {
            // 审批人根据当前角色类型来
            if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().contains("组长/队长")||sysRole.getRoleName().contains("项目部助理")) {
                List<SysUser> collect = sysUsers.stream().filter(e -> e.getDeptType() == 1 &&
                        e.getDeptId().equals(user.getDeptId())).collect(Collectors.toList());
            if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().contains("组长")|| sysRole.getRoleName().contains("队长")
                    ||sysRole.getRoleName().contains("项目部助理")) {
                TProjectDept userDept = projectDeptService.getById(user.getDeptId());

                List<SysUser> collect = sysUsers.stream().filter(e -> e.getDeptType() == 1).collect(Collectors.toList());
                for (SysUser sysUser : collect) {
                    Long userRole1 = sysUserService.getUserRole(sysUser.getUserId());
                    SysRole sysRole1 = roleService.selectRoleById(userRole1);
//                    if (sysRole1 != null && sysRole1.getRoleName().equals("项目部负责人")) {
//                        if (userDept.getId().equals(sysUser.getDeptId())){
//                            LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
//                            tLeaveAudit.setAvatar(sysUser.getAvatar());
//                            tLeaveAudit.setNickName(sysUser.getNickName());
//                            res.setAuditPerson(tLeaveAudit);
//                            res.setAuditPersonId(sysUser.getUserId() + "");
//                            break;
//                        }
//                    }
                    if (sysRole1 != null && sysRole1.getRoleName().equals("项目部负责人")) {
                        LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                        tLeaveAudit.setAvatar(sysUser.getAvatar());
                        tLeaveAudit.setNickName(sysUser.getNickName());
                        res.setAuditPerson(tLeaveAudit);
                        res.setAuditPersonId(sysUser.getUserId() + "");
                        break;
                        if (!sysRole.getRoleName().contains("项目部助理")){
                            if (userDept.getParentId().equals(sysUser.getDeptId())){
                                LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                                tLeaveAudit.setAvatar(sysUser.getAvatar());
                                tLeaveAudit.setNickName(sysUser.getNickName());
                                res.setAuditPerson(tLeaveAudit);
                                res.setAuditPersonId(sysUser.getUserId() + "");
                                break;
                            }
                        }else{
                            if (userDept.getId().equals(sysUser.getDeptId())){
                                LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                                tLeaveAudit.setAvatar(sysUser.getAvatar());
                                tLeaveAudit.setNickName(sysUser.getNickName());
                                res.setAuditPerson(tLeaveAudit);
                                res.setAuditPersonId(sysUser.getUserId() + "");
                                break;
                            }
                        }

                    }
                }
            }
@@ -611,21 +666,67 @@
            tLeaveAudit1.setAuditId(auditPerson.getUserId() + "");
            tLeaveAudit1.setAuditType(1);
            leaveAuditService.save(tLeaveAudit1);
            TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
            tLeaveAudit2.setLeaveId(leaveDTO.getId());
            tLeaveAudit2.setAuditStatus(2);
            tLeaveAudit2.setAuditId(user.getUserId() + "," + auditPerson.getUserId());
            tLeaveAudit2.setAuditType(2);
            tLeaveAudit2.setAuditTime(LocalDateTime.now());
            leaveAuditService.save(tLeaveAudit2);
        } else if (!sysRole.getRoleName().equals("部门助理")) {
            // 审批人根据当前角色类型来
            if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().contains("组长/队长")||sysRole.getRoleName().contains("项目部助理")) {
                List<SysUser> collect = sysUsers.stream().filter(e -> e.getDeptType() == 1 &&
                        e.getDeptId().equals(user.getDeptId())).collect(Collectors.toList());
            if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().contains("组长")|| sysRole.getRoleName().contains("队长")
                    ||sysRole.getRoleName().contains("项目部助理")) {
                TProjectDept userDept = projectDeptService.getById(user.getDeptId());

                List<SysUser> collect = sysUsers.stream().filter(e -> e.getDeptType() == 1).collect(Collectors.toList());
                for (SysUser sysUser : collect) {
                    Long userRole1 = sysUserService.getUserRole(sysUser.getUserId());
                    SysRole sysRole1 = roleService.selectRoleById(userRole1);

                    if (sysRole1 != null && sysRole1.getRoleName().equals("项目部负责人")) {
                        TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
                        tLeaveAudit1.setLeaveId(leaveDTO.getId());
                        tLeaveAudit1.setAuditStatus(1);
                        tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
                        tLeaveAudit1.setAuditType(1);
                        leaveAuditService.save(tLeaveAudit1);
                       if (!sysRole.getRoleName().contains("项目部助理")){
                           if (userDept.getParentId().equals(sysUser.getDeptId())){
                               LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                               tLeaveAudit.setAvatar(sysUser.getAvatar());
                               tLeaveAudit.setNickName(sysUser.getNickName());
                               TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
                               tLeaveAudit1.setLeaveId(leaveDTO.getId());
                               tLeaveAudit1.setAuditStatus(1);
                               tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
                               tLeaveAudit1.setAuditType(1);
                               leaveAuditService.save(tLeaveAudit1);
                               TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
                               tLeaveAudit2.setLeaveId(leaveDTO.getId());
                               tLeaveAudit2.setAuditStatus(2);
                               tLeaveAudit2.setAuditId(user.getUserId() + "," + sysUser.getUserId());
                               tLeaveAudit2.setAuditType(2);
                               tLeaveAudit2.setAuditTime(LocalDateTime.now());
                               leaveAuditService.save(tLeaveAudit2);
                               break;
                           }
                       }else{
                           if (userDept.getId().equals(sysUser.getDeptId())){
                               LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                               tLeaveAudit.setAvatar(sysUser.getAvatar());
                               tLeaveAudit.setNickName(sysUser.getNickName());
                               TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
                               tLeaveAudit1.setLeaveId(leaveDTO.getId());
                               tLeaveAudit1.setAuditStatus(1);
                               tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
                               tLeaveAudit1.setAuditType(1);
                               leaveAuditService.save(tLeaveAudit1);
                               TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
                               tLeaveAudit2.setLeaveId(leaveDTO.getId());
                               tLeaveAudit2.setAuditStatus(2);
                               tLeaveAudit2.setAuditId(user.getUserId() + "," + sysUser.getUserId());
                               tLeaveAudit2.setAuditType(2);
                               tLeaveAudit2.setAuditTime(LocalDateTime.now());
                               leaveAuditService.save(tLeaveAudit2);
                               break;
                           }
                       }

                    }
                }
            }
@@ -642,16 +743,17 @@
                    tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
                    tLeaveAudit1.setAuditType(1);
                    leaveAuditService.save(tLeaveAudit1);
                    TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
                    tLeaveAudit2.setLeaveId(leaveDTO.getId());
                    tLeaveAudit2.setAuditStatus(2);
                    tLeaveAudit2.setAuditId(user.getUserId() + "," + auditPerson.getUserId());
                    tLeaveAudit2.setAuditType(2);
                    tLeaveAudit2.setAuditTime(LocalDateTime.now());
                    leaveAuditService.save(tLeaveAudit2);
                }
            }
        }
        TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
        tLeaveAudit2.setLeaveId(leaveDTO.getId());
        tLeaveAudit2.setAuditStatus(2);
        tLeaveAudit2.setAuditId(user.getUserId() + "," + auditPerson.getUserId());
        tLeaveAudit2.setAuditType(2);
        tLeaveAudit2.setAuditTime(LocalDateTime.now());
        leaveAuditService.save(tLeaveAudit2);

        // 新增消息
        TNotice tNotice = new TNotice();
        tNotice.setUserId(leaveDTO.getAuditId());
@@ -702,10 +804,10 @@
    public  R<LeaveUserDetailVO> leaveDetail(@RequestParam String id) {
        TLeave leave = leaveService.getById(id);
        LeaveUserDetailVO leaveUserDetailVO = new LeaveUserDetailVO();
        SysUser sysUser = sysUserService.selectUserById(Long.parseLong(leave.getLeavePerson()));
        SysUser sysUser = sysUserService.selectUserById(tokenService.getLoginUserApplet().getUserId());
        Long userRole = sysUserService.getUserRole(sysUser.getUserId());
        SysRole sysRole = roleService.selectRoleById(userRole);
        if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().equals("组长/队长")||sysRole.getRoleName().contains("项目部助理")) {
        if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().equals("组长")|| sysRole.getRoleName().equals("队长")||sysRole.getRoleName().contains("项目部助理")) {
            if (sysUser.getDeptType() == 1) {
                TProjectDept tProjectDept = projectDeptService.getById(sysUser.getDeptId());
                if (!tProjectDept.getParentId().equals("0")) {