From 5224b79436b16039d07a981029e330f48b3c7708 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 23 三月 2026 10:05:46 +0800
Subject: [PATCH] fix: 日期格式转换、生产订单缺少查询条件
---
src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
index 10cc41e..f17b568 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.mapper.BaseParamMapper;
import com.ruoyi.basic.pojo.BaseParam;
@@ -32,24 +34,24 @@
public class BaseParamServiceImpl extends ServiceImpl<BaseParamMapper, BaseParam> implements BaseParamService {
@Override
- public List<BaseParam> baseParamList(BaseParam baseParam) {
+ public IPage<BaseParam> baseParamList(Page<BaseParam> page, BaseParam baseParam) {
LambdaQueryWrapper<BaseParam> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(baseParam.getParamName())) {
queryWrapper.like(BaseParam::getParamName, baseParam.getParamName());
}
- List<BaseParam> list = list(queryWrapper);
- if (list == null || list.isEmpty()) {
- return new ArrayList<>(0);
+ Page<BaseParam> paramPage = page(page, queryWrapper);
+ if (paramPage == null || paramPage.getRecords().isEmpty()) {
+ return new Page<>();
}
// 澶勭悊鏃ユ湡鏍煎紡灞曠ず
- list.forEach(item -> {
+ paramPage.getRecords().forEach(item -> {
if (Integer.valueOf(4).equals(item.getParamType()) && StringUtils.isNotEmpty(item.getParamFormat())) {
item.setParamFormat(toUpperCasePattern(item.getParamFormat()));
}
});
- return list;
+ return paramPage;
}
@Override
@@ -152,8 +154,7 @@
private String toUpperCasePattern(String pattern) {
if (StringUtils.isEmpty(pattern)) return "";
return pattern.replace("yyyy", "YYYY")
- .replace("dd", "DD")
- .replace("ss", "SS");
+ .replace("dd", "DD");
}
@Override
--
Gitblit v1.9.3