From b2e6bc84d81a75784e89b124ca7b403c9ac19ae7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 17 Aug 2021 21:06:12 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 22 ++++++++++++++++++++++
src/main/java/org/springblade/modules/information/service/IInformationService.java | 1 +
src/main/java/org/springblade/modules/information/controller/InformationController.java | 9 +++++++++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 1 +
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 5 +++++
5 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index 17940e8..752ba88 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -867,4 +867,13 @@
return R.data(list);
}
+ /**
+ * 业务统计明细
+ */
+ @PostMapping("/selectDis")
+ public R selectDis(String jurisdiction,String name,String fwname) {
+ List<Map<Object, Object>> list = informationService.selectDis(jurisdiction, name, fwname);
+ return R.data(list);
+ }
+
}
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 b773dd0..2253424 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -71,6 +71,7 @@
List<Map<Object,Object>> selectIn(String jurisdiction);
List<Map<Object,Object>> selectTb(String jurisdiction,String enterpriseName);
List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName);
+ List<Map<Object,Object>> selectDis(String jurisdiction,String name,String fwname);
Map<String, String> queryYearZ(String year,String jurisdiction,String deptid);
Map<String, String> queryYearZc(String year,String jurisdiction,String deptid);
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 68aa145..e6b5959 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1275,4 +1275,26 @@
and soil =#{soil}
</if>
</select>
+
+ <select id="selectDis" resultType="java.util.HashMap">
+ SELECT d.dept_name AS gsname,
+ di.dispatcherTime,
+ di.end_time,
+ de.dept_name as fwname,
+ di.num,
+ j.dept_name as jurname
+ FROM sys_dispatcher di
+ LEFT JOIN blade_dept d ON d.id = di.dept_id
+ LEFT JOIN blade_dept de ON de.id = di.dispatcher_unit_id
+ LEFT JOIN sys_jurisdiction j ON j.id = di.jurisdiction where 1=1
+ <if test="name!=null and name!=''">
+ and di.dept_name like concat('%', #{name},'%')
+ </if>
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
+ and di.jurisdiction =#{jurisdiction}
+ </if>
+ <if test="fwname!=null and name!=''">
+ and de.dept_name like concat('%', #{fwname},'%')
+ </if>
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/information/service/IInformationService.java b/src/main/java/org/springblade/modules/information/service/IInformationService.java
index a1bc606..5bad3e2 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -79,4 +79,5 @@
List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName);
List<Map<Object,Object>> selectYw(String jurisdiction,String deptid);
List<Map<Object,Object>> selectUIn(String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
+ List<Map<Object,Object>> selectDis(String jurisdiction,String name,String fwname);
}
diff --git a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
index 67f11f4..9a199f4 100644
--- a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -230,5 +230,10 @@
return baseMapper.selectUIn(deptid, name, hold, photo, examinationtype, dispatch,soil);
}
+ @Override
+ public List<Map<Object, Object>> selectDis(String jurisdiction, String name, String fwname) {
+ return baseMapper.selectDis(jurisdiction, name, fwname);
+ }
+
}
--
Gitblit v1.9.3