From 3664ff0935aeab26d23926331333a1f55caea1c1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 15:23:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandMapper.java |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandMapper.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandMapper.java
index 99fe71c..5cc52d8 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandMapper.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandMapper.java
@@ -16,6 +16,7 @@
  */
 package org.sxkj.gd.orderdata.mapper;
 
+import org.sxkj.gd.orderdata.dto.GdSupplyDemandDTO;
 import org.sxkj.gd.orderdata.entity.GdSupplyDemandEntity;
 import org.sxkj.gd.orderdata.param.GdSupplyDemandPageParam;
 import org.sxkj.gd.orderdata.vo.GdSupplyDemandVO;
@@ -39,9 +40,44 @@
 	 *
 	 * @param page
 	 * @param gdSupplyDemand
+	 * @param deptIdList
 	 * @return
 	 */
-	List<GdSupplyDemandVO> selectGdSupplyDemandPage(IPage page, @Param("param") GdSupplyDemandPageParam gdSupplyDemand);
+	List<GdSupplyDemandVO> selectGdSupplyDemandPage(IPage page, @Param("param") GdSupplyDemandPageParam gdSupplyDemand, @Param("deptIdList") List<Long> deptIdList);
+
+	/**
+	 * 列表分页
+	 *
+	 * @param page
+	 * @param gdSupplyDemand
+	 * @return
+	 */
+	List<GdSupplyDemandEntity> selectGdSupplyDemandList(IPage page, @Param("param") GdSupplyDemandDTO gdSupplyDemand);
+
+	/**
+	 * 详情查询
+	 *
+	 * @param gdSupplyDemand
+	 * @param deptIdList
+	 * @return
+	 */
+	GdSupplyDemandEntity selectGdSupplyDemandDetail(@Param("param") GdSupplyDemandDTO gdSupplyDemand, @Param("deptIdList") List<Long> deptIdList);
+
+	/**
+	 * 新增数据
+	 *
+	 * @param gdSupplyDemand
+	 * @return
+	 */
+	int insertGdSupplyDemand(GdSupplyDemandEntity gdSupplyDemand);
+
+	/**
+	 * 更新数据
+	 *
+	 * @param gdSupplyDemand
+	 * @return
+	 */
+	int updateGdSupplyDemand(GdSupplyDemandEntity gdSupplyDemand);
 
 
 	/**

--
Gitblit v1.9.3