Commit 30fe50b4 authored by suhuiguang's avatar suhuiguang

1.兼容生产环境a071 老数据需求

parent a2ca3979
...@@ -389,11 +389,11 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService { ...@@ -389,11 +389,11 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
private void filledParentCompanyName(JgBizCountDataDto c, JgBizEquipStateCountVo vo) { private void filledParentCompanyName(JgBizCountDataDto c, JgBizEquipStateCountVo vo) {
// 生产环境特殊数据处理,之前未限制只能选所 // 生产环境特殊数据处理,之前未限制只能选所
if( c.getReceiveCompanyCode().split("\\*").length == 1){ if( c.getReceiveCompanyCode().split("\\*").length == 2){
// 直接上级(区县) // 直接上级(区县)
String parentOrgCode = c.getReceiveCompanyCode().substring(0, c.getReceiveCompanyCode().lastIndexOf("*")); String parentOrgCode = c.getReceiveCompanyCode().substring(0, c.getReceiveCompanyCode().lastIndexOf("*"));
vo.setCountyManagementUnitName(orgCodeNameMap.get(parentOrgCode)); vo.setCountyManagementUnitName(orgCodeNameMap.get(parentOrgCode));
} else if( c.getReceiveCompanyCode().split("\\*").length > 1){ } else if( c.getReceiveCompanyCode().split("\\*").length > 2){
// 直接上级(区县) // 直接上级(区县)
String parentOrgCode = c.getReceiveCompanyCode().substring(0, c.getReceiveCompanyCode().lastIndexOf("*")); String parentOrgCode = c.getReceiveCompanyCode().substring(0, c.getReceiveCompanyCode().lastIndexOf("*"));
vo.setCountyManagementUnitName(orgCodeNameMap.get(parentOrgCode)); vo.setCountyManagementUnitName(orgCodeNameMap.get(parentOrgCode));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment