Browse Source

代码修复

dev_shibei_match
jianjun 5 years ago
parent
commit
24536ebcf8
  1. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/FactIndexAgencySelfSubScoreDao.java
  2. 15
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/FactIndexAgencySelfSubScoreDao.java

@ -18,7 +18,7 @@
package com.epmet.dao.evaluationindex.indexcal;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.evaluationindex.indexcal.FactIndexAgencySelfSubScoreEntity;
import com.epmet.entity.evaluationindex.indexcal.AgencySelfSubScoreEntity;
import org.apache.ibatis.annotations.Mapper;
/**
@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
* @since v1.0.0 2020-09-21
*/
@Mapper
public interface FactIndexAgencySelfSubScoreDao extends BaseDao<FactIndexAgencySelfSubScoreEntity> {
public interface FactIndexAgencySelfSubScoreDao extends BaseDao<AgencySelfSubScoreEntity> {
}

15
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

@ -19,6 +19,7 @@ import com.epmet.dao.evaluationindex.screen.IndexGroupDetailDao;
import com.epmet.dao.evaluationindex.screen.ScreenCustomerGridDao;
import com.epmet.dto.ScreenCustomerGridDTO;
import com.epmet.dto.indexcal.*;
import com.epmet.entity.evaluationindex.indexcal.AgencySelfSubScoreEntity;
import com.epmet.entity.evaluationindex.indexcal.GridScoreEntity;
import com.epmet.entity.evaluationindex.indexcal.GridSubScoreEntity;
import com.epmet.entity.evaluationindex.screen.IndexGroupDetailEntity;
@ -121,8 +122,18 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
log.error("calculateSelfSubScore gridSubScoreDao.selectSubListByPath return empty,customerId:{} ", formDTO.getCustomerId());
return;
}
selfSubIndexList.forEach(score -> {
Map<String, String> selfSubParentMap = new HashMap<>();
selfSubIndexList.forEach(o -> {
//找出自身 和下级的指标
if (o.getAllParentIndexCode().contains("xiaji")) {
selfSubParentMap.put(o.getAllParentIndexCode(), "xiaji");
} else {
selfSubParentMap.put(o.getAllParentIndexCode(), "zishen");
}
});
Map<String, AgencySelfSubScoreEntity> insertList = new HashMap<>();
subScore.forEach(score -> {
insertList.get(score.getAllParentIndexCode());
});
});
}

Loading…
Cancel
Save