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/mapper/InformationMapper.java | 4 ++-- 1 files changed, 2 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 65f256c..77d9bfd 100644 --- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java +++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java @@ -58,14 +58,14 @@ Map<String, String> queryYearPz(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 selectLi(IPage page, String jurisdiction, String deptid,String stats); + List selectLi(IPage page, String jurisdiction, String deptid,String stats,String startTime,String endTime); 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<String, Object>> seleP(String jurisdiction,String deptid); - List selectYw(IPage page,String jurisdiction,String deptid,String stats); + List selectYw(IPage page,String jurisdiction,String deptid,String stats,String startTime,String endTime); List selectUIn(IPage page,String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil); List<Map<Object,Object>> selectJur(); int selectExtypeUser(); -- Gitblit v1.9.3