|
@ -84,9 +84,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
logger.warn("calculateGridDangJian customerId:{} have not any indexGroupDetail", formDTO.getCustomerId()); |
|
|
logger.warn("calculateGridDangJian customerId:{} have not any indexGroupDetail", formDTO.getCustomerId()); |
|
|
throw new RenException("客户【网格相关:党建能力】指标权重信息不存在"); |
|
|
throw new RenException("客户【网格相关:党建能力】指标权重信息不存在"); |
|
|
} |
|
|
} |
|
|
logger.info("=================================计算网格相关-党建能力 start==================================================================================="); |
|
|
|
|
|
calculateGridDangJian(formDTO, dangJianNengLiList); |
|
|
calculateGridDangJian(formDTO, dangJianNengLiList); |
|
|
logger.info("=================================计算网格相关-党建能力 end==================================================================================="); |
|
|
|
|
|
//2、计算网格相关-治理能力
|
|
|
//2、计算网格相关-治理能力
|
|
|
List<IndexGroupDetailEntity> zhiLiNengLiList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(), |
|
|
List<IndexGroupDetailEntity> zhiLiNengLiList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(), |
|
|
IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(), |
|
|
IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(), |
|
@ -95,9 +93,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
logger.warn("calculateGridZhiLi customerId:{} have not any indexGroupDetail", formDTO.getCustomerId()); |
|
|
logger.warn("calculateGridZhiLi customerId:{} have not any indexGroupDetail", formDTO.getCustomerId()); |
|
|
throw new RenException("客户【网格相关:治理能力】指标权重信息不存在"); |
|
|
throw new RenException("客户【网格相关:治理能力】指标权重信息不存在"); |
|
|
} |
|
|
} |
|
|
logger.info("=================================计算网格相关-治理能力 start==================================================================================="); |
|
|
|
|
|
calculateGridZhiLi(formDTO, zhiLiNengLiList); |
|
|
calculateGridZhiLi(formDTO, zhiLiNengLiList); |
|
|
logger.info("=================================计算网格相关-治理能力 end==================================================================================="); |
|
|
|
|
|
//3、计算网格相关-服务能力
|
|
|
//3、计算网格相关-服务能力
|
|
|
List<IndexGroupDetailEntity> fuWuNengLiList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(), |
|
|
List<IndexGroupDetailEntity> fuWuNengLiList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(), |
|
|
IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(), |
|
|
IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(), |
|
@ -106,9 +102,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
logger.warn("calculateGridFuWu customerId:{} have not any indexGroupDetail", formDTO.getCustomerId()); |
|
|
logger.warn("calculateGridFuWu customerId:{} have not any indexGroupDetail", formDTO.getCustomerId()); |
|
|
throw new RenException("客户【网格相关:服务能力】指标权重信息不存在"); |
|
|
throw new RenException("客户【网格相关:服务能力】指标权重信息不存在"); |
|
|
} |
|
|
} |
|
|
logger.info("=================================计算网格相关-服务能力 start==================================================================================="); |
|
|
|
|
|
calculateGridFuWu(formDTO, fuWuNengLiList); |
|
|
calculateGridFuWu(formDTO, fuWuNengLiList); |
|
|
logger.info("=================================计算网格相关-服务能力 end==================================================================================="); |
|
|
|
|
|
//4、计算网格相关总分
|
|
|
//4、计算网格相关总分
|
|
|
List<IndexGroupDetailEntity> wgxgList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(), |
|
|
List<IndexGroupDetailEntity> wgxgList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(), |
|
|
IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode()); |
|
|
IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode()); |
|
@ -167,7 +161,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
//列名不为空
|
|
|
//列名不为空
|
|
|
if (IndexCodeEnum.ZUZHINEIDANGYDLXQZNLKPFPJZ.getCode().equals(key)) { |
|
|
if (IndexCodeEnum.ZUZHINEIDANGYDLXQZNLKPFPJZ.getCode().equals(key)) { |
|
|
//组织内党员的联系群众能力考评分(平均值)
|
|
|
//组织内党员的联系群众能力考评分(平均值)
|
|
|
logger.info("组织内党员的联系群众能力考评分(平均值) 单独处理"); |
|
|
// logger.info("组织内党员的联系群众能力考评分(平均值) 单独处理");
|
|
|
//网格内党员的联系群众能力考评分(平均值)
|
|
|
//网格内党员的联系群众能力考评分(平均值)
|
|
|
String gridId = (String) recordMap.get(IndexCalConstant.GRID_ID); |
|
|
String gridId = (String) recordMap.get(IndexCalConstant.GRID_ID); |
|
|
BigDecimal contactMassesAvgValue = getGridContactMassesAvgValue(formDTO, gridId); |
|
|
BigDecimal contactMassesAvgValue = getGridContactMassesAvgValue(formDTO, gridId); |
|
@ -198,8 +192,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
**/ |
|
|
**/ |
|
|
private Map<String, BigDecimal> getContactMassesAblityMap(CalculateCommonFormDTO calculateCommonFormDTO) { |
|
|
private Map<String, BigDecimal> getContactMassesAblityMap(CalculateCommonFormDTO calculateCommonFormDTO) { |
|
|
Map<String, BigDecimal> map = new HashMap<>(); |
|
|
Map<String, BigDecimal> map = new HashMap<>(); |
|
|
//TODO
|
|
|
List<BigDecimal> list = cpcScoreDao.selectListGridContactMassesAvgValue(calculateCommonFormDTO); |
|
|
/*List<BigDecimal> list = cpcScoreDao.selectListGridContactMassesAvgValue(calculateCommonFormDTO); |
|
|
|
|
|
if (!CollectionUtils.isEmpty(list)) { |
|
|
if (!CollectionUtils.isEmpty(list)) { |
|
|
BigDecimal minValue = Collections.min(list); |
|
|
BigDecimal minValue = Collections.min(list); |
|
|
BigDecimal maxValue = Collections.max(list); |
|
|
BigDecimal maxValue = Collections.max(list); |
|
@ -208,9 +201,10 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
return map; |
|
|
return map; |
|
|
} |
|
|
} |
|
|
map.put(StrConstant.MIN, new BigDecimal(NumConstant.ZERO_STR)); |
|
|
map.put(StrConstant.MIN, new BigDecimal(NumConstant.ZERO_STR)); |
|
|
map.put(StrConstant.MAX, new BigDecimal(NumConstant.ZERO_STR));*/ |
|
|
map.put(StrConstant.MAX, new BigDecimal(NumConstant.ZERO_STR)); |
|
|
map.put(StrConstant.MIN, new BigDecimal("24.35")); |
|
|
//FOR TEST
|
|
|
map.put(StrConstant.MAX, new BigDecimal("46.13")); |
|
|
/*map.put(StrConstant.MIN, new BigDecimal("24.35")); |
|
|
|
|
|
map.put(StrConstant.MAX, new BigDecimal("46.13"));*/ |
|
|
return map; |
|
|
return map; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -223,19 +217,19 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
* @Date 2020/8/31 9:50 |
|
|
* @Date 2020/8/31 9:50 |
|
|
**/ |
|
|
**/ |
|
|
private BigDecimal getGridContactMassesAvgValue(CalculateCommonFormDTO calculateCommonFormDTO, String gridId) { |
|
|
private BigDecimal getGridContactMassesAvgValue(CalculateCommonFormDTO calculateCommonFormDTO, String gridId) { |
|
|
//TODO
|
|
|
BigDecimal result = cpcScoreDao.selectGridContactMassesAvgValue(calculateCommonFormDTO.getCustomerId(), calculateCommonFormDTO.getMonthId(), gridId); |
|
|
/*BigDecimal result = cpcScoreDao.selectGridContactMassesAvgValue(calculateCommonFormDTO.getCustomerId(), calculateCommonFormDTO.getMonthId(), gridId); |
|
|
|
|
|
if (null == result) { |
|
|
if (null == result) { |
|
|
return new BigDecimal(NumConstant.ZERO_STR); |
|
|
return new BigDecimal(NumConstant.ZERO_STR); |
|
|
}*/ |
|
|
} |
|
|
BigDecimal result=null; |
|
|
//FOR TEST
|
|
|
|
|
|
/* BigDecimal result=null; |
|
|
if(IndexCalConstant.S1_C1_G1.equals(gridId)){ |
|
|
if(IndexCalConstant.S1_C1_G1.equals(gridId)){ |
|
|
result= new BigDecimal("24.43"); |
|
|
result= new BigDecimal("24.43"); |
|
|
}else if(IndexCalConstant.S1_C1_G2.equals(gridId)){ |
|
|
}else if(IndexCalConstant.S1_C1_G2.equals(gridId)){ |
|
|
result=new BigDecimal("46.13"); |
|
|
result=new BigDecimal("46.13"); |
|
|
}else if(IndexCalConstant.S1_C2_G1.equals(gridId)){ |
|
|
}else if(IndexCalConstant.S1_C2_G1.equals(gridId)){ |
|
|
result=new BigDecimal("24.35"); |
|
|
result=new BigDecimal("24.35"); |
|
|
} |
|
|
}*/ |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -248,19 +242,19 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
* @Date 2020/8/31 15:51 |
|
|
* @Date 2020/8/31 15:51 |
|
|
**/ |
|
|
**/ |
|
|
private BigDecimal getGridJoinIssueAvgValue(CalculateCommonFormDTO formDTO, String gridId) { |
|
|
private BigDecimal getGridJoinIssueAvgValue(CalculateCommonFormDTO formDTO, String gridId) { |
|
|
// TODO
|
|
|
BigDecimal result = cpcScoreDao.selectGridJoinIssueAvgValue(formDTO.getCustomerId(), formDTO.getMonthId(), gridId); |
|
|
/*BigDecimal result = cpcScoreDao.selectGridJoinIssueAvgValue(formDTO.getCustomerId(), formDTO.getMonthId(), gridId); |
|
|
|
|
|
if (null == result) { |
|
|
if (null == result) { |
|
|
return new BigDecimal(NumConstant.ZERO_STR); |
|
|
return new BigDecimal(NumConstant.ZERO_STR); |
|
|
}*/ |
|
|
} |
|
|
BigDecimal result=null; |
|
|
//FOR TEST
|
|
|
|
|
|
/*BigDecimal result=null; |
|
|
if(IndexCalConstant.S1_C1_G1.equals(gridId)){ |
|
|
if(IndexCalConstant.S1_C1_G1.equals(gridId)){ |
|
|
result= new BigDecimal("29.40"); |
|
|
result= new BigDecimal("29.40"); |
|
|
}else if(IndexCalConstant.S1_C1_G2.equals(gridId)){ |
|
|
}else if(IndexCalConstant.S1_C1_G2.equals(gridId)){ |
|
|
result=new BigDecimal("18.30"); |
|
|
result=new BigDecimal("18.30"); |
|
|
}else if(IndexCalConstant.S1_C2_G1.equals(gridId)){ |
|
|
}else if(IndexCalConstant.S1_C2_G1.equals(gridId)){ |
|
|
result=new BigDecimal("9.15"); |
|
|
result=new BigDecimal("9.15"); |
|
|
} |
|
|
}*/ |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -273,8 +267,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
**/ |
|
|
**/ |
|
|
private Map<String, BigDecimal> getJoinIssueAblityMap(CalculateCommonFormDTO calculateCommonFormDTO) { |
|
|
private Map<String, BigDecimal> getJoinIssueAblityMap(CalculateCommonFormDTO calculateCommonFormDTO) { |
|
|
Map<String, BigDecimal> map = new HashMap<>(); |
|
|
Map<String, BigDecimal> map = new HashMap<>(); |
|
|
//TODO
|
|
|
List<BigDecimal> list = cpcScoreDao.selectListJoinIssueAvgValue(calculateCommonFormDTO); |
|
|
/* List<BigDecimal> list = cpcScoreDao.selectListJoinIssueAvgValue(calculateCommonFormDTO); |
|
|
|
|
|
if (!CollectionUtils.isEmpty(list)) { |
|
|
if (!CollectionUtils.isEmpty(list)) { |
|
|
BigDecimal minValue = Collections.min(list); |
|
|
BigDecimal minValue = Collections.min(list); |
|
|
BigDecimal maxValue = Collections.max(list); |
|
|
BigDecimal maxValue = Collections.max(list); |
|
@ -283,9 +276,10 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
return map; |
|
|
return map; |
|
|
} |
|
|
} |
|
|
map.put(StrConstant.MIN, new BigDecimal(NumConstant.ZERO_STR)); |
|
|
map.put(StrConstant.MIN, new BigDecimal(NumConstant.ZERO_STR)); |
|
|
map.put(StrConstant.MAX, new BigDecimal(NumConstant.ZERO_STR));*/ |
|
|
map.put(StrConstant.MAX, new BigDecimal(NumConstant.ZERO_STR)); |
|
|
map.put(StrConstant.MIN, new BigDecimal("9.15")); |
|
|
// FOR TEST
|
|
|
map.put(StrConstant.MAX, new BigDecimal("29.4")); |
|
|
/*map.put(StrConstant.MIN, new BigDecimal("9.15")); |
|
|
|
|
|
map.put(StrConstant.MAX, new BigDecimal("29.4"));*/ |
|
|
return map; |
|
|
return map; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -308,7 +302,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
String yearId = DateUtils.getYearId(formDTO.getMonthId()); |
|
|
String yearId = DateUtils.getYearId(formDTO.getMonthId()); |
|
|
for (HashMap<String, BigDecimal> resultMap : resultMapList) { |
|
|
for (HashMap<String, BigDecimal> resultMap : resultMapList) { |
|
|
resultMap.forEach((gridId, partyAblityScore) -> { |
|
|
resultMap.forEach((gridId, partyAblityScore) -> { |
|
|
logger.info("网格id:" + gridId + ";分值:" + partyAblityScore); |
|
|
logger.info("网格id:" + gridId + ";index_Code:"+indexCode+";分值:" + partyAblityScore); |
|
|
GridScoreEntity gridScoreEntity = new GridScoreEntity(); |
|
|
GridScoreEntity gridScoreEntity = new GridScoreEntity(); |
|
|
gridScoreEntity.setCustomerId(formDTO.getCustomerId()); |
|
|
gridScoreEntity.setCustomerId(formDTO.getCustomerId()); |
|
|
gridScoreEntity.setGridId(gridId); |
|
|
gridScoreEntity.setGridId(gridId); |
|
@ -346,15 +340,15 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
private HashMap<String, BigDecimal> calculate(Map<String, IndexInputVO<BigDecimal>> indexMap) { |
|
|
private HashMap<String, BigDecimal> calculate(Map<String, IndexInputVO<BigDecimal>> indexMap) { |
|
|
//构造入参
|
|
|
//构造入参
|
|
|
List<IndexInputVO> indexInputVOS = this.getIndexInputVOList(indexMap); |
|
|
List<IndexInputVO> indexInputVOS = this.getIndexInputVOList(indexMap); |
|
|
// logger.info("计算的参数:{}", indexInputVOS);
|
|
|
logger.info("计算的参数"+JSON.toJSONString(indexInputVOS)); |
|
|
logger.info("..........计算的参数(List)"+JSON.toJSONString(indexInputVOS)); |
|
|
|
|
|
BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator(); |
|
|
BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator(); |
|
|
|
|
|
|
|
|
List<IndexOutputVO> listTemp=batchScoreCalculator.getScoreDetailOfIndexId(indexInputVOS); |
|
|
//如果想看每一个指标的分值调用下面的方法
|
|
|
logger.info("..........计算的结果(List)"+JSON.toJSONString(listTemp)); |
|
|
/*List<IndexOutputVO> listTemp=batchScoreCalculator.getScoreDetailOfIndexId(indexInputVOS); |
|
|
|
|
|
logger.info("计算的结果(List)"+JSON.toJSONString(listTemp));*/ |
|
|
|
|
|
|
|
|
HashMap<String, BigDecimal> resultMap = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS); |
|
|
HashMap<String, BigDecimal> resultMap = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS); |
|
|
logger.info("计算的结果(HashMap):{}", resultMap); |
|
|
logger.info("计算的结果{}", resultMap); |
|
|
return resultMap; |
|
|
return resultMap; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -386,23 +380,16 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
private Map<String, IndexInputVO<BigDecimal>> buildGridCorrelationIndexInputVO(CalculateCommonFormDTO formDTO, List<IndexGroupDetailEntity> indexList, Map<String, Object> minAndMaxMap) { |
|
|
private Map<String, IndexInputVO<BigDecimal>> buildGridCorrelationIndexInputVO(CalculateCommonFormDTO formDTO, List<IndexGroupDetailEntity> indexList, Map<String, Object> minAndMaxMap) { |
|
|
Map<String, IndexInputVO<BigDecimal>> map = new HashMap<>(); |
|
|
Map<String, IndexInputVO<BigDecimal>> map = new HashMap<>(); |
|
|
for (IndexGroupDetailEntity index : indexList) { |
|
|
for (IndexGroupDetailEntity index : indexList) { |
|
|
// IndexInputVO indexInputVO = new IndexInputVO();
|
|
|
|
|
|
// 指标code
|
|
|
|
|
|
// indexInputVO.setIndexId(index.getIndexCode());
|
|
|
|
|
|
//阈值
|
|
|
|
|
|
// indexInputVO.setThreshold(index.getThreshold());
|
|
|
|
|
|
//权重
|
|
|
|
|
|
// indexInputVO.setWeight(index.getWeight());
|
|
|
|
|
|
BigDecimal minValue = null; |
|
|
BigDecimal minValue = null; |
|
|
BigDecimal maxValue = null; |
|
|
BigDecimal maxValue = null; |
|
|
if (IndexCodeEnum.ZUZHINEIDANGYDLXQZNLKPFPJZ.getCode().equals(index.getIndexCode())) { |
|
|
if (IndexCodeEnum.ZUZHINEIDANGYDLXQZNLKPFPJZ.getCode().equals(index.getIndexCode())) { |
|
|
//组织内党员的联系群众能力考评分(平均值) 获取最大值,最小值
|
|
|
//组织内党员的联系群众能力考评分(平均值) 获取最大值,最小值
|
|
|
logger.info("组织内党员的联系群众能力考评分(平均值) 单独处理"); |
|
|
// logger.info("组织内党员的联系群众能力考评分(平均值) 单独处理");
|
|
|
Map<String, BigDecimal> contactMassesAblityMap = this.getContactMassesAblityMap(formDTO); |
|
|
Map<String, BigDecimal> contactMassesAblityMap = this.getContactMassesAblityMap(formDTO); |
|
|
minValue = contactMassesAblityMap.get(StrConstant.MIN); |
|
|
minValue = contactMassesAblityMap.get(StrConstant.MIN); |
|
|
maxValue = contactMassesAblityMap.get(StrConstant.MAX); |
|
|
maxValue = contactMassesAblityMap.get(StrConstant.MAX); |
|
|
} else if (IndexCodeEnum.ZUZHINEIDANGYDSYYSNLKPFPJZ.getCode().equals(index.getIndexCode())) { |
|
|
} else if (IndexCodeEnum.ZUZHINEIDANGYDSYYSNLKPFPJZ.getCode().equals(index.getIndexCode())) { |
|
|
logger.info("组织内党员的参与议事能力考评分(平均值) 单独处理"); |
|
|
// logger.info("组织内党员的参与议事能力考评分(平均值) 单独处理");
|
|
|
Map<String, BigDecimal> joinIssueAblityMap = this.getJoinIssueAblityMap(formDTO); |
|
|
Map<String, BigDecimal> joinIssueAblityMap = this.getJoinIssueAblityMap(formDTO); |
|
|
minValue = joinIssueAblityMap.get(StrConstant.MIN); |
|
|
minValue = joinIssueAblityMap.get(StrConstant.MIN); |
|
|
maxValue = joinIssueAblityMap.get(StrConstant.MAX); |
|
|
maxValue = joinIssueAblityMap.get(StrConstant.MAX); |
|
@ -410,12 +397,10 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
//获取指标对应的列名
|
|
|
//获取指标对应的列名
|
|
|
String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(index.getIndexCode()); |
|
|
String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(index.getIndexCode()); |
|
|
if (StringUtils.isBlank(fieldName)) { |
|
|
if (StringUtils.isBlank(fieldName)) { |
|
|
logger.error("index_code1:{} not find field_name",index.getIndexCode()); |
|
|
logger.error("index_code:{} not find field_name",index.getIndexCode()); |
|
|
continue; |
|
|
continue; |
|
|
}else{ |
|
|
|
|
|
logger.info("index_code2:{} ,field_name:{}",index.getIndexCode(),fieldName); |
|
|
|
|
|
} |
|
|
} |
|
|
// logger.info("index_code:{} ",index.getIndexCode(),"field_id :{} ",fieldName);
|
|
|
// logger.info("index_code2:{} ,field_name:{}",index.getIndexCode(),fieldName);
|
|
|
String minValueKey = fieldName.concat(StrConstant.UNDER_LINE).concat(StrConstant.MIN); |
|
|
String minValueKey = fieldName.concat(StrConstant.UNDER_LINE).concat(StrConstant.MIN); |
|
|
String maxValueKey = fieldName.concat(StrConstant.UNDER_LINE).concat(StrConstant.MAX); |
|
|
String maxValueKey = fieldName.concat(StrConstant.UNDER_LINE).concat(StrConstant.MAX); |
|
|
minValue = new BigDecimal(String.valueOf(minAndMaxMap.get(minValueKey))); |
|
|
minValue = new BigDecimal(String.valueOf(minAndMaxMap.get(minValueKey))); |
|
@ -428,13 +413,11 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
ScoreConstants.MAX_SCORE, |
|
|
ScoreConstants.MAX_SCORE, |
|
|
Correlation.getCorrelation(index.getCorrelation()) |
|
|
Correlation.getCorrelation(index.getCorrelation()) |
|
|
); |
|
|
); |
|
|
// indexInputVO.setScoreCalculator(scoreCalculator);
|
|
|
|
|
|
List<SampleValue<BigDecimal>> sampleValueList = new ArrayList<>(); |
|
|
List<SampleValue<BigDecimal>> sampleValueList = new ArrayList<>(); |
|
|
// indexInputVO.setIndexValueVOs(sampleValueList);
|
|
|
|
|
|
IndexInputVO indexInputVO1 = new IndexInputVO(index.getIndexCode(), |
|
|
IndexInputVO indexInputVO1 = new IndexInputVO(index.getIndexCode(), |
|
|
sampleValueList, |
|
|
sampleValueList, |
|
|
// index.getThreshold(), TODO
|
|
|
index.getThreshold(), |
|
|
new BigDecimal("-1"), |
|
|
// new BigDecimal("-1"),//FOR TEST
|
|
|
index.getWeight(), |
|
|
index.getWeight(), |
|
|
scoreCalculator); |
|
|
scoreCalculator); |
|
|
map.put(index.getIndexCode(), indexInputVO1); |
|
|
map.put(index.getIndexCode(), indexInputVO1); |
|
@ -484,7 +467,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
indexMap.forEach((key, value) -> { |
|
|
indexMap.forEach((key, value) -> { |
|
|
//列名不为空
|
|
|
//列名不为空
|
|
|
if (IndexCodeEnum.ZUZHINEIDANGYDSYYSNLKPFPJZ.getCode().equals(key)) { |
|
|
if (IndexCodeEnum.ZUZHINEIDANGYDSYYSNLKPFPJZ.getCode().equals(key)) { |
|
|
logger.info("组织内党员的参与议事能力考评分(平均值) 单独处理"); |
|
|
// logger.info("组织内党员的参与议事能力考评分(平均值) 单独处理");
|
|
|
String gridId = (String) recordMap.get(IndexCalConstant.GRID_ID); |
|
|
String gridId = (String) recordMap.get(IndexCalConstant.GRID_ID); |
|
|
BigDecimal joinAvgValue = getGridJoinIssueAvgValue(formDTO, gridId); |
|
|
BigDecimal joinAvgValue = getGridJoinIssueAvgValue(formDTO, gridId); |
|
|
SampleValue<BigDecimal> contactMassesAblityValue = new SampleValue((String) recordMap.get(IndexCalConstant.GRID_ID), joinAvgValue); |
|
|
SampleValue<BigDecimal> contactMassesAblityValue = new SampleValue((String) recordMap.get(IndexCalConstant.GRID_ID), joinAvgValue); |
|
@ -586,13 +569,6 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
GridScoreEntity gridScoreEntity = ConvertUtils.sourceToTarget(gridScoreDTO, GridScoreEntity.class); |
|
|
GridScoreEntity gridScoreEntity = ConvertUtils.sourceToTarget(gridScoreDTO, GridScoreEntity.class); |
|
|
gridScoreEntity.setIsTotal(NumConstant.ONE_STR); |
|
|
gridScoreEntity.setIsTotal(NumConstant.ONE_STR); |
|
|
gridScoreEntity.setIndexCode(indexCode); |
|
|
gridScoreEntity.setIndexCode(indexCode); |
|
|
// gridScoreEntity.setCustomerId(gridScoreDTO.getCustomerId());
|
|
|
|
|
|
// gridScoreEntity.setGridId(gridScoreDTO.getGridId());
|
|
|
|
|
|
// gridScoreEntity.setAgencyId(gridScoreDTO.getAgencyId());
|
|
|
|
|
|
// gridScoreEntity.setAllParentIds(gridScoreDTO.getAllParentIds());
|
|
|
|
|
|
// gridScoreEntity.setQuarterId(gridScoreDTO.getQuarterId());
|
|
|
|
|
|
// gridScoreEntity.setYearId(gridScoreDTO.getYearId());
|
|
|
|
|
|
// gridScoreEntity.setMonthId(gridScoreDTO.getMonthId());
|
|
|
|
|
|
gridScoreEntity.setScore(BigDecimal.ZERO); |
|
|
gridScoreEntity.setScore(BigDecimal.ZERO); |
|
|
if (!CollectionUtils.isEmpty(gridScoreDTO.getDetailList()) && gridScoreDTO.getDetailList().size() != 3) { |
|
|
if (!CollectionUtils.isEmpty(gridScoreDTO.getDetailList()) && gridScoreDTO.getDetailList().size() != 3) { |
|
|
logger.error("customerId:" + gridScoreDTO.getCustomerId() + ";gridId:" + gridScoreDTO.getGridId() + ";monthId:" + gridScoreDTO.getMonthId() + "能力值缺失,无法计算总值"); |
|
|
logger.error("customerId:" + gridScoreDTO.getCustomerId() + ";gridId:" + gridScoreDTO.getGridId() + ";monthId:" + gridScoreDTO.getMonthId() + "能力值缺失,无法计算总值"); |
|
@ -610,14 +586,6 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public static void main(String[] args) { |
|
|
|
|
|
BigDecimal totalScore = BigDecimal.ZERO; |
|
|
|
|
|
for (int i = 1; i < 5; i++) { |
|
|
|
|
|
totalScore = totalScore.add(new BigDecimal("1.00")); |
|
|
|
|
|
} |
|
|
|
|
|
System.out.println(totalScore); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* @param customerId |
|
|
* @param customerId |
|
|
* @return com.epmet.dto.indexcal.CustomerGridInfoDTO |
|
|
* @return com.epmet.dto.indexcal.CustomerGridInfoDTO |
|
|