From 49eb10c7d1eb8deb021274806980f373af9d5ec6 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 24 Aug 2020 17:00:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=9A=E5=BB=BA=E8=83=BD=E5=8A=9B-?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3=E6=8C=87=E6=A0=87=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=20-=20=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=20-=20=E5=88=A0=E9=99=A4userId=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/indexcollect/form/GridPartyMemberDataFormDTO.java    | 5 -----
 .../dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java     | 4 +---
 .../epmet/service/indexcollect/FactIndexCollectService.java  | 2 +-
 .../indexcollect/impl/FactIndexCollectServiceImpl.java       | 2 +-
 .../mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml   | 5 +----
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
index ffdc7554cd..ed1fde8844 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
@@ -81,11 +81,6 @@ public class GridPartyMemberDataFormDTO implements Serializable {
      */
     private BigDecimal topicToIssueRatio;
 
-    /**
-     * 用户id
-     */
-    private String userId;
-
     /**
      * 上级组织Id
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
index 387a369af1..92c6c7a9e9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
@@ -36,12 +36,11 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
 
     /**
      * 1、党建能力-党员相关指标上报(按照月份)
-     *    1) 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、USER_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
      *
      * @param customerId
      * @param agencyId
      * @param gridId
-     * @param userId
      * @param yearId
      * @param monthId
      * @param quarterId
@@ -51,7 +50,6 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
     void deleteFactIndexPartyAblityCpcMonthly(@Param("customerId") String customerId,
                                               @Param("agencyId") String agencyId,
                                               @Param("gridId") String gridId,
-                                              @Param("userId") String userId,
                                               @Param("yearId") String yearId,
                                               @Param("monthId") String monthId,
                                               @Param("quarterId") String quarterId);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/FactIndexCollectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/FactIndexCollectService.java
index c9d876996b..c6a11bef17 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/FactIndexCollectService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/FactIndexCollectService.java
@@ -14,7 +14,7 @@ public interface FactIndexCollectService {
 
     /**
      * 1、党建能力-党员相关指标上报(按照月份)
-     *    根据CUSTOMER_ID、AGENCY_ID、GRID_ID、USER_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
      *
      * @param formDTO
      * @param customerId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java
index cd767ff580..93c54ad374 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java
@@ -43,7 +43,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         if (null != formDTO && formDTO.size() > NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
                 factIndexPartyAblityCpcMonthlyDao.deleteFactIndexPartyAblityCpcMonthly(customerId,
-                        formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(), formDTO.get(i).getUserId(),
+                        formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(),
                         formDTO.get(i).getYearId(), formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId());
             }
             factIndexPartyAblityCpcMonthlyDao.batchInsertFactIndexPartyAblityCpcMonthly(formDTO, customerId);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
index c967efd5fe..e8f599bfd2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
@@ -9,7 +9,6 @@
         <result property="agencyId" column="AGENCY_ID"/>
         <result property="parentId" column="PARENT_ID"/>
         <result property="gridId" column="GRID_ID"/>
-        <result property="userId" column="USER_ID"/>
         <result property="monthId" column="MONTH_ID"/>
         <result property="quarterId" column="QUARTER_ID"/>
         <result property="yearId" column="YEAR_ID"/>
@@ -32,7 +31,7 @@
 
     <delete id="deleteFactIndexPartyAblityCpcMonthly">
         delete from fact_index_party_ablity_cpc_monthly
-        where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId} AND USER_ID = #{userId}
+        where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId}
         AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId}
     </delete>
 
@@ -44,7 +43,6 @@
         AGENCY_ID,
         PARENT_ID,
         GRID_ID,
-        USER_ID,
         MONTH_ID,
         QUARTER_ID,
         YEAR_ID,
@@ -71,7 +69,6 @@
             #{item.agencyId},
             #{item.parentId},
             #{item.gridId},
-            #{item.userId},
             #{item.monthId},
             #{item.quarterId},
             #{item.yearId},