From 6d5d692edcd488a8a223571ac69a972ab8f25834 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 03 Dec 2021 17:29:34 +0800
Subject: [PATCH] 培训查询修改
---
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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 207f1ca..53cdf8b 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
@@ -18,11 +18,13 @@
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.vo.InformationStatisticsVO;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.information.mapper.InformationMapper;
import org.springblade.modules.information.service.IInformationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.information.vo.ResponseVo;
+import org.springblade.modules.system.entity.Dept;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -188,8 +190,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 +225,35 @@
}
@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) {
+ List<InformationStatisticsVO> list = baseMapper.selectYw(page, jurisdiction, deptid, stats, startTime, endTime);
+ if (list.size()>0) {
+ //遍历
+ for (InformationStatisticsVO informationStatisticsVO : list) {
+ List<Dept> deptList = baseMapper.getDeptHashChildren(informationStatisticsVO);
+ //有子级
+ if (deptList.size()>0){
+ Dept dept = new Dept();
+ dept.setId(Long.parseLong(informationStatisticsVO.getDepartmentid()));
+ //查询当前子单位的人数
+ Integer z = baseMapper.selectInformationUserNumCount(dept) + informationStatisticsVO.getZnum();
+ informationStatisticsVO.setZnum(z);
+ //已派遣人数
+ Integer p = baseMapper.selectInformationDispatcherNumCount(dept) + informationStatisticsVO.getPqnum();
+ informationStatisticsVO.setPqnum(p);
+ //持证人数
+ Integer c = baseMapper.selectInformationHoldNumCount(dept) + informationStatisticsVO.getCznum();
+ informationStatisticsVO.setCznum(c);
+ //服务单位数
+ Integer f = baseMapper.selectInformationUnitNumCount(dept) + informationStatisticsVO.getFwnum();
+ informationStatisticsVO.setFwnum(f);
+ //服务单位到期数
+ Integer d = baseMapper.selectInformationUnitExpireNumCount(dept) + informationStatisticsVO.getDqnum();
+ informationStatisticsVO.setDqnum(d);
+ }
+ }
+ }
+ return page.setRecords(list);
}
@Override
--
Gitblit v1.9.3