From 98f8d438a976d73e7c4f6434efc8867ebe2a07a5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 05 Nov 2021 17:35:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
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 127d786..43cddd3 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
@@ -188,8 +188,8 @@
}
@Override
- public IPage selectLi(IPage page,String jurisdiction, String deptid,String stats) {
- return page.setRecords(baseMapper.selectLi(page,jurisdiction, deptid,stats));
+ public IPage selectLi(IPage page,String jurisdiction, String deptid,String stats,String startTime,String endTime) {
+ return page.setRecords(baseMapper.selectLi(page,jurisdiction, deptid,stats,startTime,endTime));
}
@Override
@@ -223,8 +223,8 @@
}
@Override
- public IPage selectYw(IPage page,String jurisdiction, String deptid,String stats) {
- return page.setRecords(baseMapper.selectYw(page,jurisdiction, deptid,stats));
+ public IPage selectYw(IPage page,String jurisdiction, String deptid,String stats,String startTime,String endTime) {
+ return page.setRecords(baseMapper.selectYw(page,jurisdiction, deptid,stats,startTime,endTime));
}
@Override
@@ -441,4 +441,9 @@
public List<ResponseVo> getSecurityHoldAndSoidAndDispatchGroupCountList(Integer type) {
return baseMapper.getSecurityHoldAndSoidAndDispatchGroupCountList(type);
}
+
+ @Override
+ public List<Map<Object, Object>> seleFj(String jurisdiction) {
+ return baseMapper.seleFj(jurisdiction);
+ }
}
--
Gitblit v1.9.3