From 3bbf11c99f594a2757f601fa3c680917cea33c17 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 11:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 9baf339..1d5a924 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
@@ -4,11 +4,16 @@
import java.util.Map;
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.entity.Allocation;
import com.moral.api.entity.ResponsibilityUnit;
+import com.moral.api.pojo.ext.allocation.AllocationExt;
+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;
public interface AllocationService extends IService<Allocation> {
@@ -16,17 +21,45 @@
List<ResponsibilityUnit> seleteUnit();
- Integer insertAllocation(Allocation allocation);
+ Integer insertAllocation(AllocationAddCond allocation);
AllocationUnitDto check(Integer id);
- void updateAll(Allocation allocation);
+ void updateAll(AllocationUpdateCond allocationUpdateCond);
List<Allocation> selectAll(Map<String,Object> map);
+
+ List<Integer> unitResult();
Map<String, Object> selectUnitView(Map<String,Object> map);
List<Map<String,Object>> unitExel(Map<String,Object> map);
+ Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond);
+ /**
+ * ������id������������
+ * @param id
+ * @return AllocationExt
+ */
+ AllocationExt extOne(Integer id);
+
+ AllocationExt oneAllocation(Integer id);
+
+ void changeAllocation(AllocationChangeCond changeCond);
+
+ void checkAllocation(AllocationCheckCond checkCond);
+
+ boolean removeById(Integer id);
+
+ boolean invalidResult (Integer id,String invalidReason);
+
+ /**
+ * ������������������
+ * @param allocationListCond
+ * @return AllocationListExt
+ */
+ List<AllocationListExt> extList(AllocationListCond allocationListCond);
+
+ boolean applyFor (AllocationExtensionAddCond allocationExtensionAddCond);
}
--
Gitblit v1.8.0