From 317b7f09ce21fdaf65c850c180ab2869e3601694 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Mon, 23 May 2022 09:40:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E3=80=91=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B1=85=E6=B0=91=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/IcEventYpAnalysisResultDTO.java   | 4 ++++
 .../src/main/java/com/epmet/dao/IcEventDao.java            | 7 +++++++
 .../java/com/epmet/service/impl/IcEventServiceImpl.java    | 4 ++++
 .../src/main/resources/mapper/IcEventDao.xml               | 7 +++++++
 4 files changed, 22 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java
index 1bf3e0ce99..934833d09c 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java
+++ b/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;
     /**
      * 家属
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
index 5ee5947514..2c7812b93c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
+++ b/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);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index f7a35fd0ae..6ad0222007 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/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());
         }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 72a5c10d19..1badf78029 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/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>
\ No newline at end of file