From bab490d2da009c1a23b352b3b964e0c2dd06a0b3 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 12 六月 2025 17:32:42 +0800
Subject: [PATCH] 移动端功能优化
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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 c81fd16..4578011 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,8 +11,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
+import org.dromara.eims.domain.EimsEqu;
import org.dromara.eims.domain.EimsInspectRecord;
import org.dromara.eims.domain.vo.EimsInspectRecordVo;
+import org.dromara.eims.mapper.EimsEquMapper;
import org.dromara.eims.mapper.EimsInspectRecordMapper;
import org.springframework.stereotype.Service;
import org.dromara.eims.domain.bo.EimsInspectStBo;
@@ -39,6 +42,7 @@
public class EimsInspectStServiceImpl implements IEimsInspectStService {
private final EimsInspectStMapper baseMapper;
+ private final EimsEquMapper equMapper;
private final EimsInspectRecordMapper recordMapper;
/**
@@ -50,16 +54,36 @@
@Override
public EimsInspectStVo queryById(Long id){
EimsInspectStVo stVo = baseMapper.selectVoById(id);
+ if(stVo!=null&&stVo.getEquId()!=null){
+ EimsEqu eimsEqu = equMapper.selectById(stVo.getEquId());
+ stVo.setEquName(eimsEqu.getEquName());
+ stVo.setAssetNo(eimsEqu.getAssetNo());
+ }
+ // fillStDataSingle(stVo);
+ return stVo;
+ }
+
+ @Override
+ public EimsInspectStVo queryByStId(String stId) {
+ QueryWrapper<EimsInspectSt> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("st_id", stId);
+ EimsInspectStVo stVo = baseMapper.selectVoOne(queryWrapper);
+ if(stVo!=null&&stVo.getEquId()!=null){
+ EimsEqu eimsEqu = equMapper.selectById(stVo.getEquId());
+ stVo.setEquName(eimsEqu.getEquName());
+ stVo.setAssetNo(eimsEqu.getAssetNo());
+ }
+ // fillStDataSingle(stVo);
return stVo;
}
/**
*
- * @param stVo
- * @param type Day-鏃ヨ鍥� Month-鏈堣鍥�
+ * @param stVo type Day-鏃ヨ鍥� Month-鏈堣鍥�
+ * @param
*/
- private void fillStDataSingle(EimsInspectStVo stVo,String type) {
+ private void fillStDataSingle(EimsInspectStVo stVo) {
LambdaQueryWrapper<EimsInspectRecord> recordLqw = Wrappers.lambdaQuery();
recordLqw.eq(EimsInspectRecord::getEquId, stVo.getEquId());
@@ -69,7 +93,7 @@
LocalDate endOfMonth = planTime.with(TemporalAdjusters.lastDayOfMonth());
// 鏃ヨ鍥炬煡璇㈣寖鍥�
- if(type.equals("Day")){
+ if(stVo.getType().equals("Day")){
recordLqw.between(EimsInspectRecord::getPlanTime, planTime, planTime);
}else {
// 鏈堣鍥炬煡璇㈣寖鍥�
@@ -221,12 +245,18 @@
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"));
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;
}
--
Gitblit v1.9.3