1、新增用户活动已读表

2、修改首页获取消息数量接口，支持居民端首页各项数据统计

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -136,7 +136,7 @@ public class NewsServiceImpl implements NewsService {
         informationDto.setDataType(AppHomePageDataTypeConstant.HOME_DATA_TYPE_INFORMATION);
         informationDto.setNum(NumConstant.ZERO);
         Result<EpdcInformationFristResultDTO> information = newsFeignClient.selectOneFristByUserId(userId);
-        if (null != information && information.success()) {
+        if (null != information && information.success() &&  null != information.getData()) {
             informationDto.setNum(information.getData().getAmount());
         }
         data.add(informationDto);
@@ -146,7 +146,7 @@ public class NewsServiceImpl implements NewsService {
         actDto.setDataType(AppHomePageDataTypeConstant.HOME_DATA_TYPE_UNREAD_SIGN_UP_ACT);
         actDto.setNum(NumConstant.ZERO);
         Result<Integer> act = actInfoFeignClient.getUserUnreadSignUpActCount(userId);
-        if (null != act && act.success()) {
+        if (null != act && act.success() && null != act.getData()) {
             actDto.setNum(act.getData());
         }
         data.add(actDto);

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -527,8 +527,7 @@
         WHERE
             ai.DEL_FLAG = '0'
             AND ai.ACT_STATUS = '1'
-            AND NOW() BETWEEN ai.SIGNUP_START_TIME
-            AND ai.SIGNUP_END_TIME
+            AND ai.SIGNUP_END_TIME > NOW()
             AND ai.ID NOT IN ( SELECT t.ACT_ID FROM ( SELECT ACT_ID FROM epdc_act_user_read WHERE DEL_FLAG = '0' AND USER_ID = #{userId} ) t );
     </select>
 </mapper>