From c45ce58884c59ddf8a6051ba370215e6f62adeb8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 28 七月 2023 10:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
index 8d48079..fca91dc 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
@@ -4,6 +4,7 @@
import com.ruoyi.app.task.domain.ArdAppTask;
import com.ruoyi.app.task.domain.ArdAppTaskDetail;
import com.ruoyi.app.task.domain.ArdAppTaskPic;
+import com.ruoyi.app.taskdetail.domain.ArdAppTaskDetailPic;
/**
* app浠诲姟绠＄悊Mapper鎺ュ彛
@@ -19,8 +20,14 @@
* @param id app浠诲姟绠＄悊涓婚敭
* @return app浠诲姟绠＄悊
*/
- public ArdAppTask selectArdAppTaskByIdWithPic(String id);
- public ArdAppTask selectArdAppTaskByIdWithDetail(String id);
+ public ArdAppTask selectArdAppTaskById(String id);
+ /**
+ * 閫氳繃浠诲姟璇︽儏ID鏌ヨ浠诲姟璇︽儏
+ *
+ * @param id app浠诲姟璇︽儏涓婚敭
+ * @return app浠诲姟璇︽儏
+ */
+ public ArdAppTaskDetail selectArdAppTaskDetailById(String id);
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*
@@ -28,7 +35,14 @@
* @return app浠诲姟绠＄悊闆嗗悎
*/
public List<ArdAppTask> selectArdAppTaskList(ArdAppTask ardAppTask);
-
+ /**
+ * 鏌ヨapp浠诲姟绠＄悊鍒楄〃甯﹁鎯呭浘鐗�
+ *
+ * @param ardAppTask app浠诲姟绠＄悊
+ * @return app浠诲姟绠＄悊闆嗗悎
+ */
+ public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask);
+ public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask);
/**
* 鏂板app浠诲姟绠＄悊
*
@@ -110,4 +124,28 @@
* @return 缁撴灉
*/
public int deleteArdAppTaskDetailByTaskId(String id);
+
+ /**
+ * 淇敼app浠诲姟璇︽儏
+ *
+ * @param ardAppTaskDetail app浠诲姟璇︽儏瀵硅薄
+ * @return 缁撴灉
+ */
+ public int updateArdAppTaskDetail(ArdAppTaskDetail ardAppTaskDetail);
+
+ /**
+ * 鎵归噺鏂板app浠诲姟璇︽儏鍥剧墖
+ *
+ * @param ardAppTaskDetailPicList app浠诲姟璇︽儏鍥剧墖鍒楄〃
+ * @return 缁撴灉
+ */
+ public int batchArdAppTaskDetailPic(List<ArdAppTaskDetailPic> ardAppTaskDetailPicList);
+
+ /**
+ * 鎵归噺鍒犻櫎app浠诲姟璇︽儏鍥剧墖
+ *
+ * @param id 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteArdAppTaskDetailPicByTaskDetailId(String id);
}
--
Gitblit v1.9.3