luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion

master
yinzuomei 4 years ago
parent
c2837745c3 7d13637747
commit
45a9dd7c37
5 changed files with 13 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
  2. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml
  3. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml
  4. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml
  5. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml

11
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
View File

@ -674,7 +674,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
partition.forEach(publish -> { partition.forEach(publish -> {
List<SampleValue> index1SampleValues = new ArrayList<>(); List<SampleValue> index1SampleValues = new ArrayList<>();
publish.forEach(c -> { publish.forEach(c -> {
c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode())); // c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode()));
pid.put(c.getAgencyId(),c.getParentId()); pid.put(c.getAgencyId(),c.getParentId());
SampleValue s = new SampleValue(c.getAgencyId(), c.getScore()); SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
index1SampleValues.add(s); index1SampleValues.add(s);
@ -754,7 +754,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
governAvg.forEach(avg -> { governAvg.forEach(avg -> {
List<SampleValue> index1SampleValues = new ArrayList<>(); List<SampleValue> index1SampleValues = new ArrayList<>();
avg.forEach(c -> { avg.forEach(c -> {
c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode())); // c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode()));
pid.put(c.getAgencyId(),c.getParentId()); pid.put(c.getAgencyId(),c.getParentId());
SampleValue s = new SampleValue(c.getAgencyId(), c.getScore()); SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
index1SampleValues.add(s); index1SampleValues.add(s);
@ -835,7 +835,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
BigDecimalScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation())); BigDecimalScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
List<SampleValue> index1SampleValues = new ArrayList<>(); List<SampleValue> index1SampleValues = new ArrayList<>();
serviceAvg.forEach(c -> { serviceAvg.forEach(c -> {
c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode())); // c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode()));
pid.put(c.getAgencyId(),c.getParentId()); pid.put(c.getAgencyId(),c.getParentId());
SampleValue s = new SampleValue(c.getAgencyId(), c.getScore()); SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
index1SampleValues.add(s); index1SampleValues.add(s);
@ -932,6 +932,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
orgIds.forEach(org -> { orgIds.forEach(org -> {
SubCommunityAvgResultDTO s = new SubCommunityAvgResultDTO(); SubCommunityAvgResultDTO s = new SubCommunityAvgResultDTO();
s.setAgencyId(org.getOrgId()); s.setAgencyId(org.getOrgId());
s.setParentId(org.getPid());
subAvgScores.add(s); subAvgScores.add(s);
}); });
// 把除去孔村镇的数据赋值，孔村在下边单独处理 // 把除去孔村镇的数据赋值，孔村在下边单独处理
@ -983,7 +984,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
if (!CollectionUtils.isEmpty(kongCunGovernAbility)){ if (!CollectionUtils.isEmpty(kongCunGovernAbility)){
kongCunGovernAbility.forEach(k -> { kongCunGovernAbility.forEach(k -> {
k.put("AGENCY_ID",k.get("AGENCY_ID")); k.put("AGENCY_ID",k.get("AGENCY_ID"));
k.put("PARENT_ID",NumConstant.ZERO_STR); k.put("PARENT_ID",k.get("PARENT_ID"));
}); });
} }
if (!CollectionUtils.isEmpty(communityGovernAbility)){ if (!CollectionUtils.isEmpty(communityGovernAbility)){
@ -1012,7 +1013,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
if (!CollectionUtils.isEmpty(kongCunActivityCountList)){ if (!CollectionUtils.isEmpty(kongCunActivityCountList)){
kongCunActivityCountList.forEach(k -> { kongCunActivityCountList.forEach(k -> {
k.put("AGENCY_ID",k.get("AGENCY_ID")); k.put("AGENCY_ID",k.get("AGENCY_ID"));
k.put("PARENT_ID",NumConstant.ZERO_STR); k.put("PARENT_ID",k.get("PARENT_ID"));
}); });
} }
if (!CollectionUtils.isEmpty(ActivityCountList)){ if (!CollectionUtils.isEmpty(ActivityCountList)){

4
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml
View File

@ -288,7 +288,7 @@
<select id="selectCommunityGovernAbilityIsKongCunNew" resultType="java.util.Map"> <select id="selectCommunityGovernAbilityIsKongCunNew" resultType="java.util.Map">
SELECT SELECT
sca.AGENCY_ID, sca.AGENCY_ID,
sca.pid AS PARENT_ID, IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
#{monthId} AS MONTH_ID, #{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID, #{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID, #{yearId} AS YEAR_ID,
@ -317,7 +317,7 @@
<select id="selectStreetGovernAbilityExistsSubNotSelfNew" resultType="java.util.Map"> <select id="selectStreetGovernAbilityExistsSubNotSelfNew" resultType="java.util.Map">
SELECT SELECT
sca.AGENCY_ID, sca.AGENCY_ID,
sca.PID AS PARENT_ID, IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
#{monthId} AS MONTH_ID, #{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID, #{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID, #{yearId} AS YEAR_ID,

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml
View File

@ -176,7 +176,7 @@
<select id="selectPublishArticleCountMapExistSubStreetNew" resultType="java.util.Map"> <select id="selectPublishArticleCountMapExistSubStreetNew" resultType="java.util.Map">
SELECT SELECT
sca.AGENCY_ID, sca.AGENCY_ID,
sca.pid AS PARENT_ID, IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
#{monthId} AS MONTH_ID, #{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID, #{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID, #{yearId} AS YEAR_ID,

4
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml
View File

@ -199,7 +199,7 @@
<select id="selectActivityCountMapExistsSubNew" resultType="java.util.Map"> <select id="selectActivityCountMapExistsSubNew" resultType="java.util.Map">
SELECT SELECT
sca.AGENCY_ID, sca.AGENCY_ID,
sca.PID AS PARENT_ID, IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
#{monthId} AS MONTH_ID, #{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID, #{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID, #{yearId} AS YEAR_ID,
@ -222,7 +222,7 @@
<select id="selectActivityCountMapIsKongCunNew" resultType="java.util.Map"> <select id="selectActivityCountMapIsKongCunNew" resultType="java.util.Map">
SELECT SELECT
sca.AGENCY_ID, sca.AGENCY_ID,
sca.PID AS PARENT_ID, IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
#{monthId} AS MONTH_ID, #{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID, #{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID, #{yearId} AS YEAR_ID,

4
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
View File

@ -396,8 +396,8 @@
SELECT SELECT
sca.CUSTOMER_ID, sca.CUSTOMER_ID,
sca.AGENCY_ID AS orgId, sca.AGENCY_ID AS orgId,
sca.PID, IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PID,
sca.PIDS, IF(sca.PIDS = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PIDS) AS PIDS,
sca.`LEVEL` AS orgType, sca.`LEVEL` AS orgType,
sca.AREA_CODE sca.AREA_CODE
FROM screen_customer_agency sca FROM screen_customer_agency sca

Write Preview
Loading…
Cancel
Save