From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java b/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java
index 6de1315..9ebdecf 100644
--- a/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java
@@ -9,17 +9,17 @@
* 鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆Service鎺ュ彛
*
* @author ard
- * @date 2024-01-23
+ * @date 2024-01-25
*/
public interface IArdAppApplicationService
{
/**
* 鏌ヨ鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆
*
- * @param applicationId 鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆涓婚敭
+ * @param soilderId 鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆涓婚敭
* @return 鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆
*/
- public ArdAppApplication selectArdAppApplicationByApplicationId(String applicationId);
+ public ArdAppApplication selectArdAppApplicationBySoilderId(String soilderId);
/**
* 鏌ヨ鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆鍒楄〃
@@ -48,22 +48,36 @@
/**
* 鎵归噺鍒犻櫎鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆
*
- * @param applicationIds 闇�瑕佸垹闄ょ殑鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆涓婚敭闆嗗悎
+ * @param soilderIds 闇�瑕佸垹闄ょ殑鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteArdAppApplicationByApplicationIds(String[] applicationIds);
+ public int deleteArdAppApplicationBySoilderIds(String[] soilderIds);
/**
* 鍒犻櫎鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆淇℃伅
*
- * @param applicationId 鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆涓婚敭
+ * @param soilderId 鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆涓婚敭
* @return 缁撴灉
*/
- public int deleteArdAppApplicationByApplicationId(String applicationId);
+ public int deleteArdAppApplicationBySoilderId(String soilderId);
public int sendCheckCommandersPosition(String usersId, Map<String,Object> para);
public int sendCheckSYCarsPosition(String usersId, Map<String,Object> para);
public Map<String,List<Map<String,Object>>> getCheckPosition(String usersId);
+
+ public int approvalCheckPosition(String commanderId,Map<String,String> para);
+
+ public Map<String,List<Map<String,Object>>> getCheckPositionTrue(String commanderId);
+
+ public Map<String,List<Map<String,Object>>> getSendPositionTrue(String soilderId);
+
+ public Map<String,List<Map<String,Object>>> getCheckPositionOwn(String soilderId);
+
+ public int approvalCheckPositionOwn(String soilderId,Map<String,String> para);
+
+ public List<Map<String,Object>> getCheckPositionNo(String commanderId);///
+
+ public Map<String,Map<String,List<Map<String,Object>>>> getSoilderAndCarPositionByCommanderId(String commanderId,Map<String, Double> para);
}
--
Gitblit v1.9.3