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 | 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 a4ffd27..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
@@ -9,13 +9,14 @@
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.time.LocalDate;
+import java.util.List;
import java.util.Objects;
/**
@@ -35,8 +36,8 @@
@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());
+ if (StringUtils.hasText(coalInfoDto.getSearchAll())) {
+ queryWrapper.like(CoalInfo::getCoal, coalInfoDto.getSearchAll());
}
queryWrapper.orderByDesc(CoalInfo::getCreateTime);
return coalInfoMapper.selectPage(page, queryWrapper);
@@ -47,7 +48,7 @@
CoalInfo coalInfo = new CoalInfo();
BeanUtils.copyProperties(coalInfoDto, coalInfo);
coalInfo.setMaintainerId(SecurityUtils.getUserId());
- coalInfo.setMaintenanceDate(DateUtils.getNowDate());
+ coalInfo.setMaintenanceDate(LocalDate.now());
if (Objects.isNull(coalInfoDto.getId())) {
return coalInfoMapper.insert(coalInfo);
} else {
@@ -70,4 +71,9 @@
// 鎵ц鎵归噺閫昏緫鍒犻櫎
return coalInfoMapper.update(null, updateWrapper);
}
+
+ @Override
+ public List<CoalInfo> coalInfoList() {
+ return coalInfoMapper.selectList(null);
+ }
}
--
Gitblit v1.9.3