From c0efb2e8358f4e7ee0774c340afd453c3d0c2471 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 10 六月 2025 17:19:03 +0800
Subject: [PATCH] 1.待入库煤质维护入正式库 2.电子档案tree
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java
index 9f0a72f..750e6b1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java
@@ -9,9 +9,12 @@
import com.ruoyi.basic.entity.CoalInfo;
import com.ruoyi.basic.mapper.CoalInfoMapper;
import com.ruoyi.basic.service.CoalInfoService;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.util.Objects;
@@ -32,6 +35,9 @@
@Override
public IPage<CoalInfo> selectCoalInfoList(Page page, CoalInfoDto coalInfoDto) {
LambdaQueryWrapper<CoalInfo> queryWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.hasText(coalInfoDto.getSearchAll())) {
+ queryWrapper.like(CoalInfo::getCoal,coalInfoDto.getSearchAll());
+ }
queryWrapper.orderByDesc(CoalInfo::getCreateTime);
return coalInfoMapper.selectPage(page, queryWrapper);
}
@@ -40,7 +46,9 @@
public int addOrEditCoalInfo(CoalInfoDto coalInfoDto) {
CoalInfo coalInfo = new CoalInfo();
BeanUtils.copyProperties(coalInfoDto, coalInfo);
- if (Objects.isNull(coalInfo.getId())) {
+ coalInfo.setMaintainerId(SecurityUtils.getUserId());
+ coalInfo.setMaintenanceDate(DateUtils.getNowDate());
+ if (Objects.isNull(coalInfoDto.getId())) {
return coalInfoMapper.insert(coalInfo);
} else {
return coalInfoMapper.updateById(coalInfo);
--
Gitblit v1.9.3