From f8a7078cfaf8f4106f1081856260eae55a3a2579 Mon Sep 17 00:00:00 2001 From: zhuguifei <zhuguifei@zhuguifeideiMac.local> Date: 星期二, 18 三月 2025 08:55:44 +0800 Subject: [PATCH] 完成点检模块 --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java index 4901462..55c65ff 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java @@ -12,7 +12,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.eims.domain.EimsInspectPlan; +import org.dromara.eims.domain.EimsInspectSt; import org.dromara.eims.domain.EimsMaintPlan; +import org.dromara.eims.domain.bo.EimsInspectStBo; +import org.dromara.eims.domain.vo.EimsInspectStVo; import org.dromara.eims.domain.vo.EimsMaintOrderVo; import org.dromara.eims.mapper.EimsInspectPlanMapper; import org.dromara.eims.mapper.EimsMaintPlanMapper; @@ -73,6 +76,7 @@ return TableDataInfo.build(page); } + /** * 鏌ヨ绗﹀悎鏉′欢鐨勭偣妫�璁板綍鍒楄〃 * @@ -112,6 +116,8 @@ qw.in(bo.getInspDept() != null, "ir.insp_dept", getAllDescendantIds(bo.getInspDept())); qw.eq(bo.getStatus() != null, "ir.status", bo.getStatus()); qw.eq(bo.getInspResult() != null, "ir.insp_result", bo.getInspResult()); + qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null, + "ir.plan_time", params.get("beginPlanTime"), params.get("endPlanTime")); qw.eq(bo.getPlanTime()!=null, "ir.plan_time", bo.getPlanTime()); qw.orderByDesc("ir.create_time"); @@ -119,6 +125,7 @@ } + /** * 鏍规嵁id锛岃幏鍙栨墍鏈夊悗浠d * -- Gitblit v1.9.3