Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 f6839337d85392dde294caf959e3f171230ba08b

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

@@ -325,12 +325,12 @@
                    tasks.add(task);
                }

                // 添加应生成任务数量
                TTemplateCount templateCount = new TTemplateCount();
                templateCount.setTemplateId(detail.getId());
                templateCount.setTaskCount(tLocationList.size()* cycle);
                templateCount.setUserId(sysUser.getUserId());
                templateCountService.save(templateCount);
            // 添加应生成任务数量
            TTemplateCount templateCount = new TTemplateCount();
            templateCount.setTemplateId(detail.getTemplateId());
            templateCount.setTaskCount(tLocationList.size()* cycle);
            templateCount.setUserId(sysUser.getUserId());
            templateCountService.save(templateCount);

                taskCleanService.saveBatch(tasks);
                taskCount = taskCount + tasks.size();