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

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java

@@ -60,6 +60,10 @@ public class IcEventYpAnalysisResultDTO {
      */
     private String categoryPids;
 
+    /**
+     * 居民上报的事件的总和
+     */
+    private Integer resiReportEventCount;
     /**
      * 家属
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java

@@ -131,4 +131,11 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
     List<MyReportIcEvResDTO> selectMyReport(MyReportIcEvFormDTO formDTO);
 
     int updateRedDot(@Param("userId") String userId, @Param("icEventId")String icEventId);
+
+    /**
+     * 查询居民上报的时间数量
+     * @param reportorIdCard 上报人的身份证号
+     * @return
+     */
+    Integer getResiReportEventCount(@Param("reportorIdCard") String reportorIdCard);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -611,6 +611,9 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             dependents = getDependents(event.getIdCard());
         }
 
+        // 该居民上报事件总数
+        Integer resiReportEventCount = baseDao.getResiReportEventCount(event.getIdCard());
+
         r.setReportorName(event.getName());
         r.setSourceTypeName(sourceTypeMap.get(event.getSourceType()));
         r.setDependents(dependents);
@@ -618,6 +621,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         r.setCategoryPids(eventCategory.getCategoryPids());
         r.setReportorMobile(event.getMobile());
         r.setReportorIdCard(idCard);
+        r.setResiReportEventCount(resiReportEventCount);
         if (eventCategory != null) {
             r.setCategoryName(categoryDictItem.getParentCategoryName());
         }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -356,4 +356,11 @@
             id = #{icEventId}
             AND DEL_FLAG = '0'
     </update>
+
+    <select id="getResiReportEventCount" resultType="java.lang.Integer">
+        select count(*) c
+        from ic_event e
+        where e.ID_CARD = #{reportorIdCard}
+          and e.DEL_FLAG = '0'
+    </select>
 </mapper>