From 931734244f977a65dd35c6f606afb999d7c3c967 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 11:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/service/AllocationService.java |   20 ++++++++++++++++++++
 1 files changed, 20 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 218cbfc..0da84e8 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,6 +7,7 @@
 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.AllocationExt;
 import com.moral.api.pojo.ext.allocation.AllocationListExt;
@@ -139,5 +140,24 @@
      */
     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);
 }

--
Gitblit v1.8.0