bug修改

xuhy

9 天以前 ea92d5864732ac8833bb7bbb50819ec3feec0c24

bug修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java

@@ -80,8 +80,6 @@
    }

    public void createInspection(TTemplate template) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Date date = new Date();
        // 查询所有的模板详情
        List<TTemplateDetail> list = templateDetailService.list(Wrappers.lambdaQuery(TTemplateDetail.class)
                .eq(TTemplateDetail::getTemplateId, template.getId()));
@@ -118,20 +116,36 @@
            // 获取点位类型的占比
            String num4 = detail.getNum4();

            SysUser sysUser = sysUsers.get(0);
            List<TProjectDept> projectDeptLists = new ArrayList<>();
            if(sysUser.getDeptType() == 1){
                TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
                if("0".equals(projectDept.getParentId())){
                    projectDeptLists = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                            .eq(TProjectDept::getParentId, projectDept.getId()));
                }else {
                    projectDeptLists.add(projectDept);
                }
            }else {
                projectDeptLists = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .ne(TProjectDept::getParentId,0));
            }
            List<String> proDeptIds = projectDeptLists.stream().map(TProjectDept::getId).collect(Collectors.toList());

            // 获取项目部在该模板详情中的权重
            List<String> projectDeptIds = redisCache.getCacheList(detail.getId() + PROJECT_DEPT_WEIGHT);
            // 获取项目部列表
            List<TProjectDept> projectDeptList;
            if(CollectionUtils.isEmpty(projectDeptIds)){
                projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .ne(TProjectDept::getParentId,0));
                projectDeptList = projectDeptLists;
            }else {
                projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .ne(TProjectDept::getParentId,0)
                        .in(TProjectDept::getId, projectDeptIds));
                        .in(TProjectDept::getId, proDeptIds)
                        .notIn(TProjectDept::getId, projectDeptIds));
                // 所过所有的项目部都被抽取了，则重新抽取，并且清空项目部权重
                if(CollectionUtils.isEmpty(projectDeptList)){
                    projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class));
                    projectDeptList = projectDeptLists;
                    redisCache.deleteObject(detail.getId() + PROJECT_DEPT_WEIGHT);
                }
            }
@@ -265,12 +279,9 @@
                    task.setCleanerId(tCleaner.getId());
                });
                // 获取巡检员
                if(!CollectionUtils.isEmpty(sysUsers)){
                    SysUser sysUser = sysUsers.get(0);
                    task.setPatrolInspector(sysUser.getUserId().toString());
                    task.setPatrolInspectorDept(sysUser.getDeptId());
                    task.setUserId(sysUser.getUserId());
                }
                task.setPatrolInspector(sysUser.getUserId().toString());
                task.setPatrolInspectorDept(sysUser.getDeptId());
                task.setUserId(sysUser.getUserId());
                task.setStatus(1);
                task.setLocationId(tLocation.getId());
                task.setImplementTime(LocalDateTime.now().plusDays(1));