|
|
|
|
@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
|
|
import com.biutag.entity.system.Dept; |
|
|
|
|
import com.biutag.lan.domain.*; |
|
|
|
|
|
|
|
|
|
import com.biutag.lan.mapper.*; |
|
|
|
|
import com.biutag.lan.validate.system.DataSearchValidate; |
|
|
|
|
import com.biutag.mapper.system.DeptMapper; |
|
|
|
|
@ -84,7 +83,7 @@ public class DataService extends ServiceImpl<DataMapper, Mail> {
|
|
|
|
|
List<Dept> deptslist = null; |
|
|
|
|
List<Map<String,Object>> list = new ArrayList<>(); |
|
|
|
|
if (searchValidate.getEasydept()==null||searchValidate.getEasydept().equals("1")){ |
|
|
|
|
List<Map<String,Object>> categorylist = baseMapper.selectMailFirstCategoryWithCount(); |
|
|
|
|
List<Map<String,Object>> categorylist = baseMapper.selectMailFirstCategoryWithCount(searchValidate.getSearchStartTime(),searchValidate.getSearchEndTime()); |
|
|
|
|
int keycount = 1; |
|
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
|
for (Map<String,Object> item :categorylist){ |
|
|
|
|
@ -100,7 +99,7 @@ public class DataService extends ServiceImpl<DataMapper, Mail> {
|
|
|
|
|
Wrapper wrapper2 = new QueryWrapper<>().eq("level",2); |
|
|
|
|
deptslist = deptMapper.selectPage(page,wrapper2).getRecords(); |
|
|
|
|
for(Dept deptItem :deptslist){ |
|
|
|
|
List<Map<String,Object>> categorylistforsecond = baseMapper.selectMailCategoryWithCount(searchValidate.getEasydept(),deptItem.getId().toString(),deptItem.getName()); |
|
|
|
|
List<Map<String,Object>> categorylistforsecond = baseMapper.selectMailCategoryWithCount(searchValidate.getEasydept(),deptItem.getId().toString(),deptItem.getName(),searchValidate.getSearchStartTime(), searchValidate.getSearchEndTime()); |
|
|
|
|
int count = 1; |
|
|
|
|
Map<String,Object> mapforsecond = new HashMap<>(); |
|
|
|
|
for (Map<String,Object> item :categorylistforsecond){ |
|
|
|
|
@ -120,7 +119,7 @@ public class DataService extends ServiceImpl<DataMapper, Mail> {
|
|
|
|
|
Wrapper wrapper2 = new QueryWrapper<>().eq("level",2); |
|
|
|
|
deptslist = deptMapper.selectPage(page,wrapper2).getRecords(); |
|
|
|
|
for(Dept deptItem :deptslist){ |
|
|
|
|
List<Map<String,Object>> categorylist = baseMapper.selectMailCategoryWithCount(searchValidate.getEasydept(),deptItem.getId().toString(),deptItem.getName()); |
|
|
|
|
List<Map<String,Object>> categorylist = baseMapper.selectMailCategoryWithCount(searchValidate.getEasydept(),deptItem.getId().toString(),deptItem.getName(), searchValidate.getSearchStartTime(), searchValidate.getSearchEndTime()); |
|
|
|
|
int count = 1; |
|
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
|
for (Map<String,Object> item :categorylist){ |
|
|
|
|
@ -139,7 +138,7 @@ public class DataService extends ServiceImpl<DataMapper, Mail> {
|
|
|
|
|
Wrapper wrapper2 = new QueryWrapper<>().eq("level",2).eq("id",searchValidate.getSdept()); |
|
|
|
|
deptslist = deptMapper.selectPage(page,wrapper2).getRecords(); |
|
|
|
|
for(Dept deptItem :deptslist){ |
|
|
|
|
List<Map<String,Object>> categorylist = baseMapper.selectMailCategoryWithCount(searchValidate.getEasydept(),deptItem.getId().toString(),deptItem.getName()); |
|
|
|
|
List<Map<String,Object>> categorylist = baseMapper.selectMailCategoryWithCount(searchValidate.getEasydept(),deptItem.getId().toString(),deptItem.getName(), searchValidate.getSearchStartTime(), searchValidate.getSearchEndTime()); |
|
|
|
|
int count = 1; |
|
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
|
for (Map<String,Object> item :categorylist){ |
|
|
|
|
@ -156,7 +155,7 @@ public class DataService extends ServiceImpl<DataMapper, Mail> {
|
|
|
|
|
Wrapper wrapper3 = new QueryWrapper<>().eq("level",3).eq("pid",searchValidate.getSdept()); |
|
|
|
|
deptslist = deptMapper.selectPage(page,wrapper3).getRecords(); |
|
|
|
|
for(Dept deptItem :deptslist){ |
|
|
|
|
List<Map<String,Object>> categorylist = baseMapper.selectMailThreeCategoryWithCount(searchValidate.getEasydept(),deptItem.getId().toString(),deptItem.getName()); |
|
|
|
|
List<Map<String,Object>> categorylist = baseMapper.selectMailThreeCategoryWithCount(searchValidate.getEasydept(),deptItem.getId().toString(),deptItem.getName(),searchValidate.getSearchStartTime(), searchValidate.getSearchEndTime()); |
|
|
|
|
int count = 1; |
|
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
|
for (Map<String,Object> item :categorylist){ |
|
|
|
|
|