From 002f9e7d3576cc85bc5decd42c7bce02ef4bb6c4 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 18 Dec 2023 12:59:44 +0800
Subject: [PATCH] chore:测试提交

---
 screen-api/src/main/java/com/moral/api/service/AllocationService.java |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 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 3bf0d6a..18b9bcb 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
@@ -7,18 +7,18 @@
 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.AllocationLog;
 import com.moral.api.entity.ResponsibilityUnit;
+import com.moral.api.pojo.ext.allocation.AllocationExcelExt;
 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;
 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;
+import com.moral.api.pojo.vo.app.AppAuthority;
 
 public interface AllocationService extends IService<Allocation> {
 
@@ -139,7 +139,29 @@
      * @param userId
      * @return
      */
-    Integer authority(String allocationNum,Integer userId);
+    AppAuthority authority(String allocationNum, Integer userId);
+
+    /**
+     * ������������������
+     * @param id
+     * @param unitId
+     */
+    void updataUnit(Integer id,Integer unitId,Integer polluteType);
+
+    /**
+     * ������������������
+     * @param allocationNum
+     * @return
+     */
+    List<AllocationLog> getLog(String allocationNum);
+
+    /**
+     * ������������������������������   ���������������������������
+     * @param code
+     * @return
+     */
+    List<Integer> getUnitAuthority(String code);
 
 
+    List<AllocationExcelExt> listExcel(List<Integer> id);
 }

--
Gitblit v1.8.0