议题附表

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ExtractConstant.java

@@ -0,0 +1,13 @@
+package com.epmet.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/16 3:56 下午
+ */
+public interface ExtractConstant {
+
+    String PARTY = "党员";
+
+    String STRANGER = "陌生人";
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueLogDailyFormDTO.java

@@ -38,6 +38,11 @@ public class IssueLogDailyFormDTO implements Serializable {
      */
     private String agencyId;
 
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
     /**
      * 日期ID
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java

@@ -59,7 +59,6 @@ public class IssueExtractServiceImpl implements IssueExtractService {
      * @date 2020/9/15 2:02 下午
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Boolean issueExtractMain(String customerId, String dateId) {
 
         // 议题信息查询
@@ -131,13 +130,25 @@ public class IssueExtractServiceImpl implements IssueExtractService {
                 }
             });
         });
+        delAndInsertMain(customerId,dateId,result);
+        return true;
+    }
+
+    /**
+     * @Description  议题主表删除插入
+     * @param customerId
+     * @param dateId
+     * @param result
+     * @author zxc
+     * @date 2020/9/16 3:32 下午
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void delAndInsertMain(String customerId,String dateId,List<IssueMainDailyFormDTO> result){
         issueMainDailyDao.deleteOldMainRecord(customerId, dateId);
         issueMainDailyDao.insertIssueMainList(result);
-        return true;
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Boolean issueExtractLog(String customerId, String dateId) {
 
         // 查询议题process
@@ -184,9 +195,22 @@ public class IssueExtractServiceImpl implements IssueExtractService {
                 }
             });
         });
+        delAndInsertLog(customerId,dateId,result);
+        return true;
+    }
+
+    /**
+     * @Description  议题附表删除插入
+     * @param customerId
+     * @param dateId
+     * @param result
+     * @author zxc
+     * @date 2020/9/16 3:32 下午
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void delAndInsertLog(String customerId,String dateId,List<IssueLogDailyFormDTO> result){
         issueLogDailyDao.deleteOldLogRecord(customerId, dateId);
         issueLogDailyDao.insertIssueLogList(result);
-        return true;
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -3,6 +3,7 @@ package com.epmet.service.user.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.constant.ExtractConstant;
 import com.epmet.dao.user.UserDao;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.extract.result.UserPartyResultDTO;
@@ -136,13 +137,18 @@ public class UserServiceImpl implements UserService {
             collect.forEach((userId,c) -> {
                 AtomicReference<Boolean> isParty = new AtomicReference<>(false);
                 c.forEach(user -> {
-                    if (user.getRoleName().equals("党员")){
+                    if (user.getRoleName().equals(ExtractConstant.PARTY)){
                         isParty.set(true);
                     }
                 });
                 result.put(userId,isParty.get() == true ? NumConstant.ONE : NumConstant.ZERO);
             });
         }
+        for (String userId : userIds) {
+            if (!result.containsKey(userId)){
+                result.put(userId,NumConstant.ZERO);
+            }
+        }
         return result;
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueLogDailyDao.xml

@@ -55,6 +55,11 @@
 
     <!-- 删除旧的记录 -->
     <delete id="deleteOldLogRecord">
-
+        DELETE
+        FROM
+            fact_origin_issue_log_daily
+        WHERE
+            CUSTOMER_ID = #{customerId}
+          AND DATE_ID = #{dateId}
     </delete>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

@@ -61,7 +61,7 @@
     <delete id="deleteOldMainRecord">
         DELETE
         FROM
-            fact_origin_issue_log_daily
+            fact_origin_issue_main_daily
         WHERE
             CUSTOMER_ID = #{customerId}
           AND DATE_ID = #{dateId}