diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java index b927112fd..e11d7a21c 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java @@ -128,7 +128,7 @@ public class RedisKeys { } /** - * 管理员部门层级关系 + * 管理员有数据权限的部门层级关系 * * @param userId 用户id * @return java.lang.String @@ -140,7 +140,12 @@ public class RedisKeys { } /** - * 部门关系 + * 存放部门层级关系,主要用于获取拼接后的部门id和部门名称 + * + * @param deptId + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/20 20:34 */ public static String getDeptOptionKey(Long deptId) { return rootPrefix.concat("options:dept:common:").concat(String.valueOf(deptId)); @@ -155,8 +160,24 @@ public class RedisKeys { /** * 按项目分类设置项目响应/关闭时限 + * + * @param categoryId + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/20 20:38 */ public static String getKpiItemTimeLimitKey(String categoryId) { return rootPrefix.concat("config:kpi:itemtimelimit:").concat(categoryId); } + + /** + * 存储议题响应/关闭时限 + * + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/20 20:39 + */ + public static String getKpiIssueTimeLimitKey() { + return rootPrefix.concat("config:kpi:itemtimelimit"); + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java index 4674953b7..ac6a56d87 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java @@ -412,10 +412,9 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl deptIdList; + // 分页获取所有网格 + List deptIdList = deptUtils.getDeptIdList(dept, pageSize, pageIndex); do { - // 分页获取所有网格 - deptIdList = deptUtils.getDeptIdList(dept, pageSize, pageIndex); //月统计 monthFromDto.setDeptIdList(deptIdList); monthFromDto.setTimeType(KpiCycleEnum.KPI_CYCLE_MONTH.getValue());