From 7c9742190965b22f4ea3864aa8588fad19e0be58 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 29 Sep 2021 20:27:18 +0800
Subject: [PATCH] 培训审核查询修改
---
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 ef75c0b..99b412f 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
@@ -25,6 +25,7 @@
import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.arg;
import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.BeanUtil;
@@ -36,10 +37,15 @@
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IRoleService;
+import org.springblade.modules.system.service.IUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -56,6 +62,7 @@
*/
@Service
public class InformationServiceImpl extends ServiceImpl<InformationMapper, Information> implements IInformationService {
+
@Override
public IPage<InformationVO> selectInformationPage(IPage<InformationVO> page, InformationVO information) {
@@ -113,20 +120,21 @@
}
@Override
- public List<Map<Object, Object>> selectDisp(String deptid) {
- return baseMapper.selectDisp(deptid);
+ public List<Map<Object, Object>> selectDisp(String deptid,String jurisdiction) {
+ return baseMapper.selectDisp(deptid,jurisdiction);
}
@Override
- public List<Map<Object, Object>> selectSoil(String deptid) {
- return baseMapper.selectSoil(deptid);
+ public List<Map<Object, Object>> selectSoil(String deptid,String jurisdiction) {
+ return baseMapper.selectSoil(deptid,jurisdiction);
}
@Override
- public Map<String, String> queryYearKh(String year, String jurisdiction, String deptid) {
+ public List queryYearKh(String year, String jurisdiction, String deptid) {
return baseMapper.queryYearKh(year, jurisdiction, deptid);
}
+
/**
* 查询培训单位信息(可以报名)
* @param page
--
Gitblit v1.9.3