|
|
@ -77,12 +77,12 @@ public class FactIndexServiceImpl implements FactIndexService { |
|
|
|
} |
|
|
|
//4.根据组织级别判断查询哪类数据表
|
|
|
|
//区县级、乡镇街道级
|
|
|
|
if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { |
|
|
|
if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { |
|
|
|
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分数据
|
|
|
|
list = factIndexAgencyScoreDao.selectAgencyAblityWeightScoreIndex(formDTO); |
|
|
|
|
|
|
|
//社区级
|
|
|
|
} else if ("community".equals(agency.getLevel())) { |
|
|
|
} else if ("community".equals(agency.getAgencyLevel())) { |
|
|
|
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
|
|
|
|
list = factIndexCommunityScoreDao.selectCommunityAblityWeightScore(formDTO); |
|
|
|
} else { |
|
|
@ -179,11 +179,11 @@ public class FactIndexServiceImpl implements FactIndexService { |
|
|
|
} |
|
|
|
//3.根据组织级别判断查询哪类数据表
|
|
|
|
//区县级、乡镇街道级
|
|
|
|
if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { |
|
|
|
if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { |
|
|
|
//3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
|
|
|
|
resultList = factIndexAgencyScoreDao.selectAgencyWeightScoreList(formDTO); |
|
|
|
//社区级
|
|
|
|
} else if ("community".equals(agency.getLevel())) { |
|
|
|
} else if ("community".equals(agency.getAgencyLevel())) { |
|
|
|
//3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
|
|
|
|
resultList = factIndexCommunityScoreDao.selectCommunityWeightScoreList(formDTO); |
|
|
|
} else { |
|
|
@ -227,12 +227,12 @@ public class FactIndexServiceImpl implements FactIndexService { |
|
|
|
} |
|
|
|
//4.根据组织级别判断查询哪类数据表
|
|
|
|
//区县级、乡镇街道级
|
|
|
|
if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { |
|
|
|
if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { |
|
|
|
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
|
|
|
|
list = factIndexAgencyScoreDao.selectAgencyMonthWeightScoreList(formDTO); |
|
|
|
|
|
|
|
//社区级
|
|
|
|
} else if ("community".equals(agency.getLevel())) { |
|
|
|
} else if ("community".equals(agency.getAgencyLevel())) { |
|
|
|
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
|
|
|
|
list = factIndexCommunityScoreDao.selectCommunityMonthWeightScoreList(formDTO); |
|
|
|
} else { |
|
|
@ -298,8 +298,8 @@ public class FactIndexServiceImpl implements FactIndexService { |
|
|
|
} |
|
|
|
//3.根据组织级别拼接查询条件,判断查询不同数据表
|
|
|
|
//区县级、乡镇街道级
|
|
|
|
if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { |
|
|
|
if ("district".equals(agency.getLevel())) { |
|
|
|
if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { |
|
|
|
if ("district".equals(agency.getAgencyLevel())) { |
|
|
|
formDTO.setAllParentIndexCode(FactConstant.QUAN_QU_XIANG_GUAN + ":" + formDTO.getIndexCode()); |
|
|
|
} else { |
|
|
|
formDTO.setAllParentIndexCode(FactConstant.JIE_DAO_XIANG_GUAN + ":" + formDTO.getIndexCode()); |
|
|
@ -307,7 +307,7 @@ public class FactIndexServiceImpl implements FactIndexService { |
|
|
|
resultList = factIndexAgencySubScoreDao.selectAblityList(formDTO); |
|
|
|
|
|
|
|
//社区级
|
|
|
|
} else if ("community".equals(agency.getLevel())) { |
|
|
|
} else if ("community".equals(agency.getAgencyLevel())) { |
|
|
|
formDTO.setAllParentIndexCode(FactConstant.SHE_QU_XIANG_GUAN + ":" + formDTO.getIndexCode()); |
|
|
|
resultList = factIndexCommunitySubScoreDao.selectCommunityAblityList(formDTO); |
|
|
|
} else { |
|
|
@ -366,10 +366,10 @@ public class FactIndexServiceImpl implements FactIndexService { |
|
|
|
} |
|
|
|
//4.根据组织级别拼接查询条件,判断查询不同数据表
|
|
|
|
//区县级、乡镇街道级
|
|
|
|
if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { |
|
|
|
if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { |
|
|
|
resultList = factIndexAgencySubScoreDao.selectMonthAblityList(formDTO); |
|
|
|
//社区级
|
|
|
|
} else if ("community".equals(agency.getLevel())) { |
|
|
|
} else if ("community".equals(agency.getAgencyLevel())) { |
|
|
|
resultList = factIndexCommunitySubScoreDao.selectCommunityMonthAblityList(formDTO); |
|
|
|
} else { |
|
|
|
//throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
|
|
|
|