From 8261ceda58718fe8becb795d09e152a3b61a6f22 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 16:39:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/IGdMaterialService.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/service/IGdImplementationListService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/IGdMaterialService.java
similarity index 61%
copy from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/service/IGdImplementationListService.java
copy to drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/IGdMaterialService.java
index 89d6120..0fad166 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/service/IGdImplementationListService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/IGdMaterialService.java
@@ -14,31 +14,32 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.sxkj.gd.implementation.service;
+package org.sxkj.gd.implement.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
-import org.sxkj.gd.implementation.vo.GdImplementationListVO;
-import org.sxkj.gd.implementation.excel.GdImplementationListExcel;
+import org.sxkj.gd.implement.dto.GdMaterialDTO;
+import org.sxkj.gd.implement.entity.GdMaterialEntity;
+import org.sxkj.gd.implement.vo.GdMaterialVO;
+import org.sxkj.gd.implement.excel.GdMaterialExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
/**
- * 实施清单表（实时清单管理） 服务类
+ * 材料信息表 服务类
*
- * @author lw
- * @since 2026-01-14
+ * @author Aix
+ * @since 2026-01-31
*/
-public interface IGdImplementationListService extends BaseService<GdImplementationListEntity> {
+public interface IGdMaterialService extends BaseService<GdMaterialEntity> {
/**
* 自定义分页
*
* @param page
- * @param gdImplementationList
+ * @param gdMaterial
* @return
*/
- IPage<GdImplementationListVO> selectGdImplementationListPage(IPage<GdImplementationListVO> page, GdImplementationListVO gdImplementationList);
+ IPage<GdMaterialVO> selectGdMaterialPage(IPage<GdMaterialVO> page, GdMaterialDTO gdMaterial);
/**
@@ -47,6 +48,6 @@
* @param queryWrapper
* @return
*/
- List<GdImplementationListExcel> exportGdImplementationList(Wrapper<GdImplementationListEntity> queryWrapper);
+ List<GdMaterialExcel> exportGdMaterial(Wrapper<GdMaterialEntity> queryWrapper);
}
--
Gitblit v1.9.3