Merge remote-tracking branch 'origin/feature/phaseOne'

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@@ -230,16 +230,15 @@
     </select>
     <select id="partyMemberAge" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyMemberAgeResultDTO">
         SELECT
-            IFNULL(SUM( AGE_EIGHTEEN_THIRTY ), 0) AS ageEighteenThirty,
-            IFNULL(SUM( AGE_THIRTY_ONE_FORTY ), 0) AS ageThirtyOneForty,
-            IFNULL(SUM( AGE_FORTY_ONE_FIFTY ), 0) AS ageFortyOneFifty,
-            IFNULL(SUM( AGE_FIFTY_ONE_SIXTY ), 0) AS ageFiftyOneSixty,
-            IFNULL(SUM( AGE_SIXTY_ONE_SEVENTY ), 0) AS ageSixtyOneSeventy,
-            IFNULL(SUM( AGE_OVER_SEVENTY ), 0) AS ageOverSeventy
-        FROM
-            esua_epdc_analysis.epdc_screen_party_member_age_statistics
-        WHERE
-            DEL_FLAG = '0'
+            SUM(if((year(now())-substring(eui.ID_CARD, 7, 4))BETWEEN 18 and 30,1,0)) AS AGE_EIGHTEEN_THIRTY,
+            SUM(if((year(now())-substring(eui.ID_CARD, 7, 4))BETWEEN 31 and 40,1,0)) AS AGE_THIRTY_ONE_FORTY,
+            SUM(if((year(now())-substring(eui.ID_CARD, 7, 4))BETWEEN 41 and 50,1,0)) AS AGE_FORTY_ONE_FIFTY,
+            SUM(if((year(now())-substring(eui.ID_CARD, 7, 4))BETWEEN 51 and 60,1,0)) AS AGE_FIFTY_ONE_SIXTY,
+            SUM(if((year(now())-substring(eui.ID_CARD, 7, 4))BETWEEN 61 and 70,1,0)) AS AGE_SIXTY_ONE_SEVENTY,
+            SUM(if((year(now())-substring(eui.ID_CARD, 7, 4))>70,1,0)) AS AGE_OVER_SEVENTY
+        FROM esua_epdc_custom.epidemic_user_info eui
+        WHERE eui.DEL_FLAG = '0'
+          AND eui.POLITICS_STATUS = '1'
     </select>
 
     <select id="frontPageDeptInfoList"  resultMap="frontPageDeptInfoListMap">
@@ -316,12 +315,12 @@
     <select id="frontPageHouseTypeStatistics"
             resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO">
       SELECT
-        sum(if(HOUSE_TYPE ='0',HOUSE_NUM ,0)) as aloneLiveNum,
-        sum(if(HOUSE_TYPE ='1',HOUSE_NUM ,0)) as rentNum,
-        sum(if(HOUSE_TYPE ='2',HOUSE_NUM ,0)) as dormitoryNum,
-        sum(if(HOUSE_TYPE ='3',HOUSE_NUM ,0)) as vacantNum,
-        sum(if(HOUSE_TYPE ='4',HOUSE_NUM ,0)) as otherNum
-      FROM esua_epdc_analysis.epdc_screen_house_type_statistics
+        count(HOUSE_USE = '0' OR NULL) as aloneLiveNum,
+        count(HOUSE_USE = '1' OR NULL) as rentNum,
+        count(HOUSE_USE = '2' OR NULL) as dormitoryNum,
+        count(HOUSE_USE = '3' OR NULL) as vacantNum,
+        count(HOUSE_USE = '4' OR NULL) as otherNum
+      FROM esua_epdc_custom.epdc_housing_information
       WHERE  DEL_FLAG = '0'
     </select>