From 453f63fd6cd6466222304df619e62b3a5667ca68 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 05 八月 2025 13:56:47 +0800
Subject: [PATCH] 修复0730测试问题
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 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 199219d..d59e63a 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.dromara.common.core.constant.DictConstants;
+import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -10,9 +11,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.eims.domain.EimsEqu;
import org.dromara.eims.domain.EimsInspectRecord;
+import org.dromara.eims.domain.EimsMaintOrder;
import org.dromara.eims.domain.vo.EimsInspectRecordVo;
+import org.dromara.eims.domain.vo.EimsMaintStVo;
import org.dromara.eims.mapper.EimsEquMapper;
import org.dromara.eims.mapper.EimsInspectRecordMapper;
import org.springframework.stereotype.Service;
@@ -131,20 +135,12 @@
@Override
public TableDataInfo<EimsInspectStVo> queryPageList(EimsInspectStBo bo, PageQuery pageQuery) {
bo.setType(bo.getViewMode());
- // 鏈堣鍥�
-// if(bo.getViewMode().equals("Month")){
QueryWrapper<EimsInspectSt> qw = buildWrapper(bo);
Page<EimsInspectStVo> result = baseMapper.selectInspStList(pageQuery.build(), qw);
// 濉厖鏁版嵁
fillStData(result,bo.getViewMode());
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;
}
/**
@@ -178,7 +174,7 @@
List<EimsInspectRecordVo> recordList = recordMapper.selectVoList(recordLqw);
// TODO 鏍规嵁瀛楀吀eims_inspect_status
Map<String, Long> cMap = recordList.stream()
- .filter(order -> List.of("0", "1").contains(order.getStatus()))
+ .filter(order -> List.of("0","1", "2").contains(order.getStatus()))
.collect(Collectors.groupingBy(EimsInspectRecordVo::getStatus, Collectors.counting()));
// TODO 鏍规嵁瀛楀吀eims_inspect_result
Map<String, Long> rMap = recordList.stream()
@@ -187,7 +183,8 @@
stVo.setRecordCount(recordList.size());
stVo.setUnCheckCount(cMap.getOrDefault("0", 0L).intValue());
- stVo.setCheckCount(cMap.getOrDefault("1", 0L).intValue());
+ stVo.setDqrCount(cMap.getOrDefault("1", 0L).intValue());
+ stVo.setCheckCount(cMap.getOrDefault("2", 0L).intValue());
stVo.setNormalNum(rMap.getOrDefault("1", 0L).intValue());
stVo.setAbNormalNum(rMap.getOrDefault("2", 0L).intValue());
@@ -244,12 +241,24 @@
qw.like(StringUtils.isNotBlank(bo.getTitle()), "st.title", bo.getTitle());
qw.like(StringUtils.isNotBlank(bo.getEquName()), "equ.equ_name", bo.getEquName());
qw.like(StringUtils.isNotBlank(bo.getAssetNo()), "equ.asset_no", bo.getAssetNo());
+ if(bo.getPlanTime()!=null&&bo.getViewMode() != null && bo.getViewMode().equals("Day")){
+ qw.eq("DATE_FORMAT(st.plan_time, '%Y-%m-%d')", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,bo.getPlanTime()));
+ }else if(bo.getPlanTime()!=null&&bo.getViewMode() != null && bo.getViewMode().equals("Month")){
+ qw.eq("DATE_FORMAT(st.plan_time, '%Y-%m')", DateUtils.parseDateToStr(DateUtils.YYYY_MM,bo.getPlanTime()));
+ }
qw.eq( "st.type", bo.getType());
qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null,
"st.plan_time", params.get("beginPlanTime"), params.get("endPlanTime"));
+ if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
+ qw.and(wq -> wq.like("st.title", params.get("searchValue"))
+ .or().like("equ.equ_name", params.get("searchValue"))
+ .or().like("equ.asset_no", params.get("searchValue"))
+ );
+ }
qw.eq(bo.getInspUser() != null, "st.maint_user", bo.getInspUser());
qw.eq(bo.getVerifyUser() != null, "st.verify_user", bo.getVerifyUser());
qw.eq(bo.getStatus() != null, "st.status", bo.getStatus());
+ qw.eq(bo.getUpdateBy() != null, "st.update_by", bo.getUpdateBy());
qw.orderByDesc( "st.create_time");
return qw;
}
@@ -281,14 +290,38 @@
public Boolean updateByBo(EimsInspectStBo bo) {
EimsInspectSt update = MapstructUtils.convert(bo, EimsInspectSt.class);
- if(bo.getVerifyUser()!=null){
- EimsInspectSt st = baseMapper.selectById(bo.getId());
- String status = st.getStatus();
- if(status==null || status.equals(DictConstants.MAINT_ORDER_ST_STATUS_DETAIL.N)){
- if(update.getVerifyTime()==null) update.setStatus(DictConstants.MAINT_ORDER_ST_STATUS_DETAIL.Y);
- if(update.getVerifyTime()==null) update.setVerifyTime(new Date());
- }
- }
+// if(bo.getVerifyUser()!=null){
+// EimsInspectSt st = baseMapper.selectById(bo.getId());
+// String status = st.getStatus();
+// if(status==null || status.equals(DictConstants.MAINT_ORDER_ST_STATUS_DETAIL.N)){
+// if(update.getVerifyTime()==null) update.setStatus(DictConstants.MAINT_ORDER_ST_STATUS_DETAIL.Y);
+// if(update.getVerifyTime()==null) update.setVerifyTime(new Date());
+// }
+// }
+
+
+ //鐐规姹囨�诲畬鎴愰渶鍚屾鏇存柊st涓嬪瓙宸ュ崟
+
+ EimsInspectStVo st = baseMapper.selectVoById(bo.getId());
+
+ Long equId = st.getEquId();
+ String planTime = DateUtils.dateTime(st.getPlanTime());
+ LambdaQueryWrapper<EimsInspectRecord> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(EimsInspectRecord::getEquId,equId);
+ wrapper.eq(EimsInspectRecord::getPlanTime,planTime);
+ List<EimsInspectRecord> recordList = recordMapper.selectList(wrapper);
+ // st涓嬪瓙宸ュ崟鎵�鏈夌姸鎬佽缃负3-宸插畬鎴�
+ recordList.forEach(order -> {
+ order.setStatus(bo.getStatus());
+ if(order.getStatus().equals("1")){
+ order.setInspUser(LoginHelper.getUserId());
+ }else if(order.getStatus().equals("2")){
+ order.setVerifyUser(LoginHelper.getUserId());
+ }
+ });
+ recordMapper.updateBatchById(recordList);
+
+
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
--
Gitblit v1.9.3