Merge remote-tracking branch 'origin/master'

无关风月

10 天以前 d0f0b47215dcbfbc654fc5191140fccacd43d50f

Merge remote-tracking branch 'origin/master'

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

@@ -55,12 +55,13 @@
    private ISysUserService sysUserService;
    @Autowired
    private TTaskCleanService taskCleanService;
    @Autowired
    private TTemplateCountService templateCountService;


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

    public void dayOfCreateInspection() {
        try {

@@ -229,8 +230,6 @@
            List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
                    .in(TLocation::getLocationCleaner, cleanersIds));
            // 查询点位类型
//            List<TLocationType> locationTypes = locationTypeService.list(Wrappers.lambdaQuery(TLocationType.class)
//                    .orderByDesc(TLocationType::getCreateTime));
            JSONArray jsonArray = JSONObject.parseArray(num4);
            List<TLocation> tLocationList = new ArrayList<>();
            for (Object o : jsonArray) {
@@ -292,6 +291,14 @@
                task.setTaskCode(nameAndCode);
                tasks.add(task);
            }

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

            taskCleanService.saveBatch(tasks);
            template.setTaskCount(tasks.size());
            templateService.updateById(template);

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLocationServiceImpl.java

@@ -36,21 +36,16 @@
        PageInfo<LocationListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<LocationListVO> list = this.baseMapper.pageList(query,pageInfo);
        for (LocationListVO locationListVO : list) {
            TCleaner tCleaner = cleanerMapper.selectById(locationListVO.getLocationCleaner());
            if (tCleaner!=null){
                TProjectDept tProjectDept = projectDeptMapper.selectById(tCleaner.getProjectId());
                if (tProjectDept!=null){
                    if (!tProjectDept.getParentId().equals("0")){
                        TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
                        if (tProjectDept1!=null)
                        locationListVO.setProjectName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
                    }else{
                        locationListVO.setProjectName(tProjectDept.getProjectName());
                    }
            TProjectDept tProjectDept = projectDeptMapper.selectById(locationListVO.getProjectId());
            if (tProjectDept!=null){
                if (!tProjectDept.getParentId().equals("0")){
                    TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
                    if (tProjectDept1!=null)
                    locationListVO.setProjectName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
                }else{
                    locationListVO.setProjectName(tProjectDept.getProjectName());
                }

            }

        }
        pageInfo.setRecords(list);
        return pageInfo;