Merge remote-tracking branch 'origin/dev'

4 years ago · ce98cf74b5
1 changed files with 3 additions and 0 deletions
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@ -388,6 +388,9 @@
            ROUND((ROUND(sy.govern_ablity,1) * sy.GOVERN_ABLITY_WEIGHT),1) AS governAbility,
            ROUND((ROUND(sy.party_dev_ablity,1) * sy.PARTY_DEV_WEIGHT),1) AS partyDevAbility,
            ROUND((ROUND(sy.service_ablity,1) * sy.SERVICE_ABLITY_WEIGHT),1) AS serviceAbility,
+            ROUND(sy.govern_ablity,1) AS originGovernAbility,
+            ROUND(sy.party_dev_ablity,1) AS originPartyDevAbility,
+            ROUND(sy.service_ablity,1) AS originServiceAbility,
            sy.ORG_ID as orgId,
            scg.area_code as areaCode
        FROM screen_customer_grid  scg