From 388bd216d4eb70b367ada95118d1087b45f07ae3 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 09 六月 2025 17:53:48 +0800
Subject: [PATCH] 1.煤质部分 2.代入库部分
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 8b31c3a..a4ffd27 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
@@ -4,15 +4,16 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.CoalInfoDto;
import com.ruoyi.basic.entity.CoalInfo;
-import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.mapper.CoalInfoMapper;
import com.ruoyi.basic.service.CoalInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
-import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Objects;
@@ -34,6 +35,9 @@
@Override
public IPage<CoalInfo> selectCoalInfoList(Page page, CoalInfoDto coalInfoDto) {
LambdaQueryWrapper<CoalInfo> queryWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.hasText(coalInfoDto.getCoal())) {
+ queryWrapper.like(CoalInfo::getCoal,coalInfoDto.getCoal());
+ }
queryWrapper.orderByDesc(CoalInfo::getCreateTime);
return coalInfoMapper.selectPage(page, queryWrapper);
}
@@ -42,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