Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/partymember/PartyMemberDao.xml

@@ -10,14 +10,18 @@
             GRID_ID,
             USER_ID,
             ID_CARD,
-            STR_TO_DATE( SUBSTRING( ID_CARD, 7, 8 ),'%Y%m%d') AS birthday
+            (
+                case when LENGTH(ID_CARD)=15 then STR_TO_DATE( concat('19',SUBSTRING( ID_CARD, 7, 6 )),'%Y%m%d')
+                else STR_TO_DATE( SUBSTRING( ID_CARD, 7, 8 ),'%Y%m%d')
+                end
+            )as birthday
         FROM
             partymember_info
         WHERE
             DEL_FLAG = 0
-            AND ( CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved' )
-            AND CUSTOMER_ID = #{customerId}
-            AND DATE_FORMAT( UPDATED_TIME, '%Y%m%d' ) = #{dateId}
+          AND ( CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved' )
+          AND CUSTOMER_ID = #{customerId}
+          AND DATE_FORMAT( UPDATED_TIME, '%Y%m%d' ) = #{dateId}
     </select>
 
     <select id="selectPartyMemberByCustomer" resultType="com.epmet.dto.party.PartyMemberDTO">