修改

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java

@@ -46,62 +46,62 @@ public class MetaUserGridOpiningEntity extends BaseEpdcEntity {
     /**
      * 用户总数
      */
-	private String registerCount;
+	private int registerCount;
 
     /**
      * 党员数
      */
-	private String partyCount;
+	private int partyCount;
 
     /**
      * 已注册居民
      */
-	private String residentCount;
+	private int residentCount;
 
     /**
      * 未注册居民
      */
-	private String unAuthorizedCount;
+	private int unAuthorizedCount;
 
     /**
      * 新闻发布数
      */
-	private String newsCount;
+	private int newsCount;
 
     /**
      * 社群数
      */
-	private String communityCount;
+	private int communityCount;
 
     /**
      * 群成员数
      */
-	private String communityMemberCount;
+	private int communityMemberCount;
 
     /**
      * 群话题数
      */
-	private String communityTopicCount;
+	private int communityTopicCount;
 
     /**
      * 议题总数
      */
-	private String eventCount;
+	private int eventCount;
 
     /**
      * 项目数
      */
-	private String itemCount;
+	private int itemCount;
 
     /**
      * 项目已解决数
      */
-	private String itemCloseCount;
+	private int itemCloseCount;
 
     /**
      * 好评数
      */
-	private String itemPraiseCount;
+	private int itemPraiseCount;
 
     /**
      * 网格名称

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java

@@ -101,4 +101,13 @@ public interface UserAnalysisService {
     List<GridOpeningResultDTO> selectListGridHasMaCode(Map<String, Object> params);
 
 
+
+   /***
+    * 获取导入数据
+    * @param params
+    * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+    * @author qushutong
+    * @date 2020/3/25 19:13
+    */
+    List<GridOpeningResultDTO> getToLeadGridOpenings(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java

@@ -124,8 +124,9 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
 
 
     @Override
+    @DataSource(name = DataSourceNames.TWELVE)
     public Result createUserAnalysisData() {
-        List<GridOpeningResultDTO> list = userAnalysisService.listPageGridOpeningsForExport(new HashMap<>());
+        List<GridOpeningResultDTO> list = userAnalysisService.getToLeadGridOpenings(new HashMap<>());
         List<MetaUserGridOpiningEntity> metaUserGridOpiningEntities = ConvertUtils.sourceToTarget(list, MetaUserGridOpiningEntity.class);
         boolean b = insertBatch(metaUserGridOpiningEntities);
         return b?new Result<>():new Result().error("录入失败");

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

@@ -285,9 +285,17 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
     @Override
     public List<GridOpeningResultDTO> selectListGridHasMaCode(Map<String, Object> params) {
         params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
-        params.put("category",1);
+        params.put("category",YesOrNoEnum.YES.value());
         return baseDao.selectListGridHasMaCode(params);
     }
 
+    @Override
+    public List<GridOpeningResultDTO> getToLeadGridOpenings(Map<String, Object> params) {
+        params.put("category",YesOrNoEnum.YES.value());
+        List<GridOpeningResultDTO> list = baseDao.selectListGridHasMaCode(params);
+        list = fillFieldForGridOpening(list, params);
+        return list;
+    }
+
 
 }