From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainRecordWrapper.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainRecordWrapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainRecordWrapper.java
index fb6ab82..75ebbfd 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainRecordWrapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainRecordWrapper.java
@@ -18,6 +18,7 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.sxkj.fw.device.dto.FwDeviceMaintainRecordDTO;
import org.sxkj.fw.device.entity.FwDeviceMaintainRecordEntity;
import org.sxkj.fw.device.vo.FwDeviceMaintainRecordVO;
import java.util.Objects;
@@ -26,7 +27,7 @@
* 设备维护记录表 包装类,返回视图层所需的字段
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
public class FwDeviceMaintainRecordWrapper extends BaseEntityWrapper<FwDeviceMaintainRecordEntity, FwDeviceMaintainRecordVO> {
@@ -36,14 +37,11 @@
@Override
public FwDeviceMaintainRecordVO entityVO(FwDeviceMaintainRecordEntity fwDeviceMaintainRecord) {
- FwDeviceMaintainRecordVO fwDeviceMaintainRecordVO = Objects.requireNonNull(BeanUtil.copy(fwDeviceMaintainRecord, FwDeviceMaintainRecordVO.class));
+ return Objects.requireNonNull(BeanUtil.copy(fwDeviceMaintainRecord, FwDeviceMaintainRecordVO.class));
+ }
- //User createUser = UserCache.getUser(fwDeviceMaintainRecord.getCreateUser());
- //User updateUser = UserCache.getUser(fwDeviceMaintainRecord.getUpdateUser());
- //fwDeviceMaintainRecordVO.setCreateUserName(createUser.getName());
- //fwDeviceMaintainRecordVO.setUpdateUserName(updateUser.getName());
-
- return fwDeviceMaintainRecordVO;
+ public FwDeviceMaintainRecordEntity entityDTO(FwDeviceMaintainRecordDTO fwDeviceMaintainRecord) {
+ return Objects.requireNonNull(BeanUtil.copy(fwDeviceMaintainRecord, FwDeviceMaintainRecordEntity.class));
}
--
Gitblit v1.9.3