From 39dc3d6f7168eae8fda1b0fe6671be819d35c732 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 11:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 8 +++++---
1 files changed, 5 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 680e161..16f4f0f 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
@@ -23,11 +23,13 @@
Integer insertAllocation(AllocationAddCond allocation);
- AllocationUnitDto check(Integer id);
-
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);
/**
--
Gitblit v1.8.0