From b864148d2a9afd5e1627b761da923cca8f8dfbd2 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 07 三月 2025 14:44:56 +0800
Subject: [PATCH] 修改产品结构树新增删除同步结构树表，新增刀具信息与设备类
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java
index d967588..8825c3b 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dnc.entity.DeviceCharacters;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.DeviceCharactersMapper;
@@ -17,7 +18,7 @@
@Service
public class DeviceCharactersServiceImpl extends ServiceImpl<DeviceCharactersMapper, DeviceCharacters> implements IDeviceCharactersService {
@Override
- public QueryPageResponseResult<DeviceCharacters> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest) {
+ public Result<?> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest) {
if(page < 1 || size < 1) {
ExceptionCast.cast(CommonCode.INVALID_PAGE);
@@ -32,7 +33,8 @@
lambdaQuery.ge(StrUtil.isNotEmpty(deviceCharactersRequest.getStartTime()),DeviceCharacters::getCreateTime,deviceCharactersRequest.getStartTime());
lambdaQuery.le(StrUtil.isNotEmpty(deviceCharactersRequest.getEndTime()),DeviceCharacters::getCreateTime,deviceCharactersRequest.getEndTime());
}
+ lambdaQuery.orderByDesc(DeviceCharacters::getCreateTime);
IPage<DeviceCharacters> userIPage = lambdaQuery.page(pageData);
- return new QueryPageResponseResult<>(CommonCode.SUCCESS, userIPage);
+ return Result.ok(userIPage);
}
}
--
Gitblit v1.9.3