|
|
@@ -365,24 +365,22 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
-// @Cacheable(cacheNames = "selectAllUser#500",key = "'selectAllUser:depId:'+#depId+'startTime:'+#startTime+" +
|
|
|
-// "'endTime:'+#endTime+'aName:'+#aName")
|
|
|
+ @Cacheable(cacheNames = "selectAllUser#500",key = "'selectAllUser:depId:'+#depId+'startTime:'+#startTime+" +
|
|
|
+ "'endTime:'+#endTime+'aName:'+#aName")
|
|
|
public depCountBo selectAllUser(String depId, String startTime, String endTime,String aName) {
|
|
|
depCountBo acb=new depCountBo();
|
|
|
if (endTime!=null)endTime=endTime+" 23:59:59";
|
|
|
List<depCountBo >deps=new ArrayList<>();
|
|
|
if (depId==null) {
|
|
|
acb.setName("科德集团");
|
|
|
-// organizationManagementMapper.getDepAll("科德集团",null,startTime, endTime);
|
|
|
deps=organizationManagementMapper.selectBysuperName("科德集团");
|
|
|
-
|
|
|
}else {
|
|
|
OrganizationListOut oo=organizationManagementMapper.selectAllById(depId);
|
|
|
acb.setName(oo.getName());
|
|
|
acb.setId(depId);
|
|
|
deps=organizationManagementMapper.selectBysuperId(oo.getId());
|
|
|
}
|
|
|
- List<AdminCustomerBo> list =organizationManagementMapper.testAlldepCount(startTime, endTime);
|
|
|
+ List<AdminCustomerBo> list =organizationManagementMapper.AlldepCount(startTime, endTime);
|
|
|
for (AdminCustomerBo ad : list) {
|
|
|
if (acb.getId().equals(ad.getDepId())){
|
|
|
acb.getaList().add(ad);
|