From 733b9e6837365d2817d7e8a0005b2c167c18f77e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 19 六月 2025 17:58:48 +0800
Subject: [PATCH] 1.生产加工 2.煤种id优化
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 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..0c81d6a 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,17 +4,19 @@
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.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.time.LocalDate;
+import java.util.List;
import java.util.Objects;
/**
@@ -34,6 +36,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);
}
@@ -42,7 +47,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(LocalDate.now());
+ if (Objects.isNull(coalInfoDto.getId())) {
return coalInfoMapper.insert(coalInfo);
} else {
return coalInfoMapper.updateById(coalInfo);
@@ -64,4 +71,9 @@
// 鎵ц鎵归噺閫昏緫鍒犻櫎
return coalInfoMapper.update(null, updateWrapper);
}
+
+ @Override
+ public List<CoalInfo> coalInfoList() {
+ return coalInfoMapper.selectList(null);
+ }
}
--
Gitblit v1.9.3