|
|
@@ -11,6 +11,7 @@ import javax.annotation.Resource;
|
|
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import com.goafanti.admin.bo.AdminContacts;
|
|
|
@@ -54,7 +55,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
private OrganizationManagementMapper organizationManagementMapper;
|
|
|
@Resource(name = "passwordUtil")
|
|
|
private PasswordUtil passwordUtil;
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
public List<Admin> selectAllAdmin() {
|
|
|
return adminMapper.selectAllAdmin(null);
|
|
|
@@ -234,7 +235,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
|
|
|
@Override
|
|
|
public List<AdminListBo> selectDepartmentStaff(String departmentId, String name) {
|
|
|
-
|
|
|
+
|
|
|
return adminMapper.selectDepartmentStaff( departmentId, name);
|
|
|
}
|
|
|
|
|
|
@@ -266,7 +267,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
}
|
|
|
return count;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/*
|
|
|
* List分割
|
|
|
*/
|
|
|
@@ -284,7 +285,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
}
|
|
|
return listGroup;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public List<Admin> getListDefaultPassword(String depId) {
|
|
|
@@ -360,10 +361,12 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
if (StringUtils.isNotBlank(startTime)) params.put("startTime", startTime);
|
|
|
if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
|
|
|
- return (Pagination<AdminCustomerBo>)findPage("selectAdminCustomerList", "selectAdminCustomerCount", params, pageNo, pageSize);
|
|
|
+ return (Pagination<AdminCustomerBo>)findPage("selectAdminCustomerList", "selectAdminCustomerCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
+ @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();
|
|
|
endTime=endTime+" 23:59:59";
|
|
|
@@ -372,7 +375,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
acb.setName("科德集团");
|
|
|
// organizationManagementMapper.getDepAll("科德集团",null,startTime, endTime);
|
|
|
deps=organizationManagementMapper.selectBysuperName("科德集团");
|
|
|
-
|
|
|
+
|
|
|
}else {
|
|
|
OrganizationListOut oo=organizationManagementMapper.selectAllById(depId);
|
|
|
acb.setName(oo.getName());
|
|
|
@@ -407,7 +410,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
return res;
|
|
|
}
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* @param ab
|
|
|
* @param type 0 部门计算 1人员计算
|
|
|
*/
|
|
|
@@ -445,7 +448,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
ab.setNewCount(newCount);
|
|
|
ab.setChannelNewCount(channelNewCount);
|
|
|
ab.setChannelCompleteCount(channelCompleteCount);
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@@ -486,6 +489,6 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|