bug修改

xuhy

5 天以前 2163e4b74fe82a3e422fb29007a5512001af475d

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

@@ -90,7 +90,7 @@
        // 通过模板id查询员工巡检员
        List<SysUser> sysUsers = sysUserService.selectUserByTempLateId(template.getId());
        // 创建任务
        list.forEach(detail -> {
        for (TTemplateDetail detail : list) {
            // 计算周期
            int cycle = detail.getCycle();
            switch (detail.getCycleType()){
@@ -116,6 +116,10 @@
            int num3 = detail.getNum3();
            // 获取点位类型的占比
            String num4 = detail.getNum4();

            if(CollectionUtils.isEmpty(sysUsers)){
                continue;
            }

            SysUser sysUser = sysUsers.get(0);
            List<TProjectDept> projectDeptLists = new ArrayList<>();
@@ -189,6 +193,10 @@
            }
            int dayCleanerCount = cleanerSums / cycle;

            if((cycle - detail.getCurrentValue()) == 1 && cleanerSums % cycle != 0){
                dayCleanerCount++;
            }

            // 获取保洁员权重
            List<String> cleanerIds = redisCache.getCacheList(detail.getId() + CLEANER_WEIGHT);
            // 获取保洁员列表
@@ -217,7 +225,8 @@
                redisCache.deleteObject(detail.getId() + CLEANER_WEIGHT);
                List<TCleaner> tCleaners1 = randomSelection(cleaners1, dayCleanerCount - tCleaners.size());
                List<String> cleanIds1 = tCleaners1.stream().map(TCleaner::getId).collect(Collectors.toList());
                // 将已抽取的项目部id保存到redis中
                // 将已抽取的保洁员id保存到redis中
                cleanIds1.addAll(cleanIds);
                redisCache.setCacheList(detail.getId() + CLEANER_WEIGHT, cleanIds1);
                tCleaners.addAll(tCleaners1);
            }else {
@@ -303,8 +312,7 @@
            template.setTaskCount(tasks.size());
            templateService.updateById(template);
            templateDetailService.updateById(detail);
        });

        }
    }

    /**