From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 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 b8ef70f..f7c00f6 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
@@ -21,8 +21,12 @@
* @return app浠诲姟绠＄悊
*/
public ArdAppTask selectArdAppTaskById(String id);
- public ArdAppTask selectArdAppTaskByIdWithPic(String id);
- public ArdAppTask selectArdAppTaskByIdWithDetail(String id);
+ /**
+ * 閫氳繃浠诲姟璇︽儏ID鏌ヨ浠诲姟璇︽儏
+ *
+ * @param id app浠诲姟璇︽儏涓婚敭
+ * @return app浠诲姟璇︽儏
+ */
public ArdAppTaskDetail selectArdAppTaskDetailById(String id);
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
@@ -39,6 +43,17 @@
*/
public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask);
public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask);
+ /**
+ * 鎸変换鍔d鏌ヨ浠诲姟璇︽儏鍒楄〃
+ *
+ */
+ public List<ArdAppTaskDetail> selectArdAppTaskDetailListByTaskId(String task_id);
+ /**
+ * 鎸変换鍔d鏌ヨ涓嬪彂鐨刟pp鐢ㄦ埛id鍒楄〃
+ *
+ */
+ public List<String> selectArdAppTaskDetailUserIdsByTaskId(String task_id);
+
/**
* 鏂板app浠诲姟绠＄悊
*
@@ -128,7 +143,14 @@
* @return 缁撴灉
*/
public int updateArdAppTaskDetail(ArdAppTaskDetail ardAppTaskDetail);
-
+ public int updateArdAppTaskDetailByTaskId(ArdAppTaskDetail ardAppTaskDetail);
+ /**
+ * 淇敼app浠诲姟璇︽儏鏌ョ湅
+ *
+ * @param ardAppTaskDetail app浠诲姟璇︽儏瀵硅薄
+ * @return 缁撴灉
+ */
+ public int updateArdAppTaskDetailView(ArdAppTaskDetail ardAppTaskDetail);
/**
* 鎵归噺鏂板app浠诲姟璇︽儏鍥剧墖
*
@@ -144,4 +166,19 @@
* @return 缁撴灉
*/
public int deleteArdAppTaskDetailPicByTaskDetailId(String id);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鏈�鏂扮殑浠诲姟
+ *
+ * @param userId app鐢ㄦ埛Id
+ * @return 缁撴灉
+ */
+ public ArdAppTask selectNewArdAppTaskByUserId(String userId);
+ /**
+ * 鏌ヨ宸插脊绐椾絾鏈鐨勪换鍔℃暟閲�
+ *
+ * @param userId app鐢ㄦ埛Id
+ * @return 缁撴灉
+ */
+ public int selectUnreadArdAppTaskCount(String userId);
}
--
Gitblit v1.9.3