From 38365ee0424879f654ef3b87031c537d7b27b8e3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 14:41:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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..218cbfc 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
@@ -12,10 +12,11 @@
import com.moral.api.pojo.ext.allocation.AllocationListExt;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
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.AppAuthority;
public interface AllocationService extends IService<Allocation> {
@@ -107,6 +108,14 @@
*/
List<AllocationFindVo> selectSmallRoutine(Integer state,String startTime,String endTime);
+ /**
+ * ���������������
+ * @param allocationPageCond
+ * @return
+ */
+ Page<AllocationPageExt> pageApp(AppAllocationPageCond allocationPageCond);
+
+ boolean saveFile(AppAllocationFileCond appAllocationFileCond);
/**
* ���������������
@@ -122,5 +131,13 @@
*/
void checkSmallRoutine(AllocationCheckCond checkCond);
+ /**
+ * ������������ 1 ������������������ 2.������������������ 3.���������
+ * @param allocationNum
+ * @param userId
+ * @return
+ */
+ AppAuthority authority(String allocationNum, Integer userId);
+
}
--
Gitblit v1.8.0