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 | 26 ++++++++++++++++++++++----
1 files changed, 22 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..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,18 +7,17 @@
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;
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 +138,26 @@
* @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);
}
--
Gitblit v1.8.0