From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Thu, 02 Nov 2023 17:08:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev --- screen-api/src/main/java/com/moral/api/service/AllocationService.java | 14 ++++++++++++++ 1 files changed, 14 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..abdb545 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); /** * ��������������� @@ -123,4 +134,7 @@ void checkSmallRoutine(AllocationCheckCond checkCond); + boolean authority(String allocationNum,Integer userId); + + } -- Gitblit v1.8.0