From 5c1d58556e9cd4c7603b5e16dc1640f61623af0b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 08 Nov 2023 11:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationService.java b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
index 58f721f..3bf0d6a 100644
--- a/screen-api/src/main/java/com/moral/api/service/AllocationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -14,8 +14,11 @@
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.dto.allocation.AllocationUnitDto;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
+import com.moral.api.pojo.query.app.AppAllocationFileCond;
+import com.moral.api.pojo.query.app.AppAllocationPageCond;
import com.moral.api.pojo.vo.allocation.AllocationFindVo;
import com.moral.api.pojo.vo.allocation.AllocationPageVo;
+import com.moral.api.pojo.vo.app.AppAllocationFindVo;
public interface AllocationService extends IService<Allocation> {
@@ -107,6 +110,14 @@
*/
List<AllocationFindVo> selectSmallRoutine(Integer state,String startTime,String endTime);
+ /**
+ * ���������������
+ * @param allocationPageCond
+ * @return
+ */
+ Page<AllocationPageExt> pageApp(AppAllocationPageCond allocationPageCond);
+
+ boolean saveFile(AppAllocationFileCond appAllocationFileCond);
/**
* ���������������
@@ -122,5 +133,13 @@
*/
void checkSmallRoutine(AllocationCheckCond checkCond);
+ /**
+ * ������������ 1 ������������������ 2.������������������ 3.���������
+ * @param allocationNum
+ * @param userId
+ * @return
+ */
+ Integer authority(String allocationNum,Integer userId);
+
}
--
Gitblit v1.8.0