From dca2532f01dac86be25ad09fa9ee8035bccdca6a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 27 Nov 2021 17:11:33 +0800
Subject: [PATCH] 1.部门tree修改 2.用户查询修改 3.培训报名年龄拦截
---
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 16 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 c7d9054..f431ef3 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,24 +63,52 @@
@Service
public class InformationServiceImpl extends ServiceImpl<InformationMapper, Information> implements IInformationService {
+
@Override
- public IPage<Information> selectInformationPage(IPage<Information> page, Information information) {
- return page.setRecords(baseMapper.selectInformationPage(page, information));
+ public IPage<InformationVO> selectInformationPage(IPage<InformationVO> page, InformationVO information) {
+ List<InformationVO> informationVOS = baseMapper.selectInformationPage(page, information);
+ //遍历
+ if (informationVOS.size()>0){
+ //判断有无子级
+ for (InformationVO informationVO : informationVOS) {
+ List<Dept> deptList = baseMapper.getDeptHashChildren(informationVO);
+ //有子级
+ if (deptList.size()>0){
+ for (Dept dept : deptList) {
+ //查询当前子单位的人数
+ Integer z = baseMapper.selectInformationUserNumCount(dept) + Integer.parseInt(informationVO.getZnum());
+ informationVO.setZnum(z.toString());
+ //已派遣人数
+ Integer p = baseMapper.selectInformationDispatcherNumCount(dept) + Integer.parseInt(informationVO.getPnum());
+ informationVO.setPnum(p.toString());
+ //持证人数
+ Integer c = baseMapper.selectInformationHoldNumCount(dept) + Integer.parseInt(informationVO.getCnum());
+ informationVO.setCnum(c.toString());
+ }
+ }
+ }
+ }
+ return page.setRecords(informationVOS);
}
@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
- public void deleteMe(String creditcode) {
- baseMapper.deleteMe(creditcode);
+ public void insertIn( Information information) {
+ baseMapper.insertIn(information);
+ }
+
+ @Override
+ public void deleteMe(String deptId) {
+ baseMapper.deleteMe(deptId);
}
@Override
@@ -93,13 +127,13 @@
}
@Override
- public List<Map<Object, Object>> selectExtype(String deptid) {
- return baseMapper.selectExtype(deptid);
+ public List<Map<Object, Object>> selectExtype(String deptid,String jurisdiction) {
+ return baseMapper.selectExtype(deptid,jurisdiction);
}
@Override
- public List<Map<Object, Object>> selectHold(String deptid) {
- return baseMapper.selectHold(deptid);
+ public List<Map<Object, Object>> selectHold(String deptid,String jurisdiction) {
+ return baseMapper.selectHold(deptid,jurisdiction);
}
@Override
@@ -108,14 +142,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 List queryYearKh(String year, String jurisdiction, String deptid) {
+ return baseMapper.queryYearKh(year, jurisdiction, deptid);
+ }
+
/**
* 查询培训单位信息(可以报名)
@@ -148,6 +188,10 @@
if (information.getStats().equals("武装守押公司")) {
information.setStats("3");
}
+ //跨区域保安公司
+ if (information.getStats().equals("跨区域保安公司")) {
+ information.setStats("4");
+ }
try {
arg.test01(arg.url+"/information/save",information);
} catch (Exception e) {
@@ -155,4 +199,18 @@
}
});
}
+
+ /**
+ * 根据deptid 删除用户信息
+ * @param deptId
+ */
+ @Override
+ public void deleteUserByDeptId(String deptId) {
+ baseMapper.deleteUserByDeptId(deptId);
+ }
+
+ @Override
+ public String selJurchilder(String id) {
+ return baseMapper.selJurchilder(id);
+ }
}
--
Gitblit v1.9.3