bug修改

xuhy

4 天以前 1b09f886a2c8dc47c4945dace5bd649a7b4ef0ad

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

@@ -20,6 +20,7 @@

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -63,7 +64,7 @@

    // 每一个小时执行一次
//    @Scheduled(cron = "0 0 0 * * ?")
    @Scheduled(fixedRate = 1500000000)
//    @Scheduled(fixedRate = 1500000000)
    public void dayOfCreateInspection() {
        try {

@@ -76,6 +77,17 @@
                // 创建任务
                createInspection(template);
            });

            // 查询前一天为执行的所有任务，改成已超时状态
            List<TTask> taskCleanList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                    .like(TTask::getImplementTime, LocalDate.now().minusDays(1))
                    .eq(TTask::getStatus, 1));
            if (!CollectionUtils.isEmpty(taskCleanList)) {
                taskCleanList.forEach(task -> {
                    task.setStatus(2);
                });
                taskCleanService.updateBatchById(taskCleanList);
            }

        } catch (Exception e) {
            e.printStackTrace();
@@ -124,9 +136,8 @@
                continue;
            }



            SysUser sysUser = sysUsers.get(0);
            int taskCount = 0;
            for (SysUser sysUser : sysUsers) {
            List<TProjectDept> projectDeptLists = new ArrayList<>();
            if(sysUser.getDeptType() == 1){
                TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
@@ -223,7 +234,7 @@
            // 抽取保洁员
            List<TCleaner> tCleaners = randomSelection(cleaners, dayCleanerCount);
            if(CollectionUtils.isEmpty(tCleaners)){
                log.error("没有可抽取的保洁员");
                    log.error("没有可抽取的保洁员,模板id为：{}",detail.getId());
                continue;
            }
            if(tCleaners.size() < dayCleanerCount){
@@ -322,7 +333,9 @@
            templateCountService.save(templateCount);

            taskCleanService.saveBatch(tasks);
            template.setTaskCount(tasks.size());
                taskCount = taskCount + tasks.size();
            }
            template.setTaskCount(taskCount);
            templateService.updateById(template);
            templateDetailService.updateById(detail);
        }