From 839cd39a9cfc49e5eaf73739549cf3f9e2725666 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 26 Oct 2021 21:56:24 +0800
Subject: [PATCH] 1.现场检查接口修改 2.车辆位置新增接口 3.成绩导出接口修改 4.公司信息接口修改，新增创建时间和创建人

---
 src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 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..81d63c3 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;
@@ -57,19 +63,20 @@
 @Service
 public class InformationServiceImpl extends ServiceImpl<InformationMapper, Information> implements IInformationService {
 
+
 	@Override
 	public IPage<InformationVO> selectInformationPage(IPage<InformationVO> page, InformationVO information) {
 		return page.setRecords(baseMapper.selectInformationPage(page, information));
 	}
 
 	@Override
-	public void deleteIn(String creditcode) {
-		baseMapper.deleteIn(creditcode);
+	public void deleteIn(String departmentid) {
+		baseMapper.deleteIn(departmentid);
 	}
 
 	@Override
-	public void deleteSh(String creditcode) {
-		baseMapper.deleteSh(creditcode);
+	public void deleteSh(String deptId) {
+		baseMapper.deleteSh(deptId);
 	}
 
 	@Override
@@ -78,8 +85,8 @@
 	}
 
 	@Override
-	public void deleteMe(String creditcode) {
-		baseMapper.deleteMe(creditcode);
+	public void deleteMe(String deptId) {
+		baseMapper.deleteMe(deptId);
 	}
 
 	@Override
@@ -113,19 +120,20 @@
 	}
 
 	@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);
 	}
+
 
 	/**
 	 * 查询培训单位信息(可以报名)
@@ -169,4 +177,13 @@
 			}
 		});
 	}
+
+	/**
+	 * 根据deptid 删除用户信息
+	 * @param deptId
+	 */
+	@Override
+	public void deleteUserByDeptId(String deptId) {
+		baseMapper.deleteUserByDeptId(deptId);
+	}
 }

--
Gitblit v1.9.3