点检模块

zhuguifei

2025-03-14 3e0f519c396ac8a72e7bbd426e4f38fa6cc403dc

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrderController.java

@@ -1,6 +1,10 @@
package org.dromara.eims.controller;

import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.TemporalAdjusters;
import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
@@ -54,7 +58,6 @@
    @SaCheckPermission("eims:maintOrder:list")
    @GetMapping("/groupList")
    public TableDataInfo<MaintOrdeGroupVo> group(EimsMaintOrderBo bo, PageQuery pageQuery) {
//        return eimsMaintOrderService.queryPageList(bo, pageQuery);
        return eimsMaintOrderService.queryPageGroupList(bo, pageQuery);
    }

@@ -68,9 +71,14 @@
        }
        String[] split = maintCode.split("_");
        bo.setEquId(Long.valueOf(split[0]));
        bo.setPlanTime(DateUtils.parseDate(split[1]));
        bo.setMaintCode(null);
//        return eimsMaintOrderService.queryPageList(bo, pageQuery);
        LocalDate planTime = DateUtils.parseDate(split[1]).toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
        LocalDate startOfMonth = planTime.with(TemporalAdjusters.firstDayOfMonth());
        LocalDate endOfMonth = planTime.with(TemporalAdjusters.lastDayOfMonth());
        Map<String, Object> params = bo.getParams();
        params.put("beginPlanTime",startOfMonth);
        params.put("endPlanTime",endOfMonth);

        return eimsMaintOrderService.queryPageListCustom(bo, pageQuery);
    }