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/EimsInspectStServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java
index f938a05..dc31019 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java
@@ -23,10 +23,7 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.TemporalAdjusters;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -62,11 +59,20 @@
*/
@Override
public TableDataInfo<EimsInspectStVo> queryPageList(EimsInspectStBo bo, PageQuery pageQuery) {
- QueryWrapper<EimsInspectSt> lqw = buildWrapper(bo);
- Page<EimsInspectStVo> result = baseMapper.selectInspStList(pageQuery.build(), lqw);
- // 濉厖鏁版嵁
- fillStData(result);
- return TableDataInfo.build(result);
+ // 鏈堣鍥�
+ if(bo.getViewMode().equals("Month")){
+ QueryWrapper<EimsInspectSt> qw = buildWrapper(bo);
+ Page<EimsInspectStVo> result = baseMapper.selectInspStList(pageQuery.build(), qw);
+ // 濉厖鏁版嵁
+ fillStData(result);
+ return TableDataInfo.build(result);
+ // 鏃ヨ鍥�
+ }else if(bo.getViewMode().equals("Day")){
+ Page<EimsInspectStVo> result = recordMapper.selectInspRecordDayList(pageQuery.build(), buildGroupWrapper(bo));
+ return TableDataInfo.build(result);
+ }
+
+ return null;
}
private void fillStData(Page<EimsInspectStVo> result) {
@@ -103,6 +109,25 @@
}
+ private QueryWrapper<EimsInspectSt> buildGroupWrapper(EimsInspectStBo bo) {
+ Map<String, Object> params = bo.getParams();
+ QueryWrapper<EimsInspectSt> qw = Wrappers.query();
+ qw.like(StringUtils.isNotBlank(bo.getTitle()), "CONCAT(DATE_FORMAT(ir.plan_time, '%Y%m%d'), equ.equ_name)", bo.getTitle());
+ qw.like(StringUtils.isNotBlank(bo.getEquName()), "equ.equ_name", bo.getEquName());
+ qw.like(StringUtils.isNotBlank(bo.getAssetNo()), "equ.asset_no", bo.getAssetNo());
+ qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null,
+ "ir.plan_time", params.get("beginPlanTime"), params.get("endPlanTime"));
+ qw.eq(bo.getInspUser() != null, "ir.insp_user", bo.getInspUser());
+ qw.eq(bo.getVerifyUser() != null, "ir.verify_user", bo.getVerifyUser());
+ qw.eq(bo.getStatus() != null, "ir.status", bo.getStatus());
+ qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null,
+ "ir.plan_time", params.get("beginPlanTime"), params.get("endPlanTime"));
+ qw.groupBy(Arrays.asList("ir.equ_id","ir.plan_time"));
+ qw.orderByDesc( "ir.plan_time");
+
+ return qw;
+ }
+
/**
* 鏌ヨ绗﹀悎鏉′欢鐨勭偣妫�姹囨�诲垪琛�
*
--
Gitblit v1.9.3