From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
index 2e08a78..91f8cea 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -52,14 +52,18 @@
 	Map<String, String> queryYearSoil(String year,String jurisdiction,String deptid);
 	Map<String, String> queryYearAn(String year,String jurisdiction,String deptid);
 	List<Map<Object,Object>> queryCountB(String jurisdiction,String deptid);
+	List<Map<Object,Object>> selectLi(String jurisdiction,String deptid);
 	List<Map<Object,Object>> queryCountZc(String jurisdiction,String deptid);
 	List<Map<Object,Object>> queryCountCz(String jurisdiction,String deptid);
 	List<Map<Object,Object>> queryCountSb(String jurisdiction,String deptid);
 	List<Map<Object,Object>> queryCountKh(String jurisdiction,String deptid);
 	List<Map<Object,Object>> queryCountPq(String jurisdiction,String deptid);
 	List<Map<Object,Object>> selectJur();
-	List<Map<Object,Object>> selectExtype(String jurisdiction,String deptid);
-	List<Map<Object,Object>> selectBx(String jurisdiction,String deptid);
+	List<Map<Object,Object>> selectExtype(String jurisdiction,String deptid,String type);
+	List<Map<Object,Object>> selectBx(String jurisdiction,String deptid,String type);
+	List<Map<Object,Object>> seCountI(String jurisdiction,String deptid);
+	String seCountUm(String jurisdiction,String deptid);
+	String seCountUg(String jurisdiction,String deptid);
 	List<Map<Object,Object>> selectIn(String jurisdiction);
 
 	Map<String, String> queryYearZ(String year,String jurisdiction,String deptid);
@@ -68,4 +72,5 @@
 	Map<String, String> queryYearKh(String year,String jurisdiction,String deptid);
 	Map<String, String> queryYearBanan(String year,String jurisdiction,String deptid);
 	Map<String, String> queryYearDe(String year,String jurisdiction,String deptid);
+	void deleteDept(String ids);
 }

--
Gitblit v1.9.3