Merge branch 'feature/screenJop' of http://121.42.41.42:7070/r/esua-epdc-cloud into feature/screenJop

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomeragencyResultDTO.java

@@ -0,0 +1,74 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 组织层级
+ * @author: wangtong
+ * @create: 2020-08-21 18:14
+ **/
+@Data
+public class CustomeragencyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2415663167177454669L;
+
+    /**
+     *组织id
+     */
+    private String agencyId;
+
+    /**
+     *组织名称
+     */
+    private String agencyName;
+
+    /**
+     *父级id ,顶级，此列为0
+     */
+    private String pid;
+
+    /**
+     *所有上级ID，用逗号分开
+     */
+    private String pids;
+
+    /**
+     *所有组织名称以-链接
+     */
+    private String allParentNames;
+
+    /**
+     *坐标区域
+     */
+    private String areaMarks;
+
+    /**
+     *中心点位
+     */
+    private String centerMark;
+
+    /**
+     *党工委|街道党委的位置，预留字段
+     */
+    private String partyMark;
+
+    /**
+     *机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+     */
+    private String level;
+
+    /**
+     *行政地区编码
+     */
+    private String areaCode;
+
+    /**
+     *数据更新至: yyyy|yyyyMM|yyyyMMdd
+     */
+    private String dataEndTime;
+
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomergridResultDTO.java

@@ -0,0 +1,52 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 网格信息上传
+ * @author: wangtong
+ * @create: 2020-08-21 18:11
+ **/
+@Data
+public class CustomergridResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8040800736309043807L;
+
+    /**
+     *网格id
+     */
+    private String gridId;
+
+    /**
+     *网格名称
+     */
+    private String gridName;
+
+    /**
+     *网格所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     *坐标区域可空
+     */
+    private String areaMarks;
+
+    /**
+     *中心点位可空
+     */
+    private String centerMark;
+
+    /**
+     *党支部的位置！！！
+     */
+    private String partyMark;
+
+    /**
+     *数据更新至: yyyy|yyyyMM|yyyyMMdd
+     */
+    private String dataEndTime;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java

@@ -80,4 +80,41 @@ public class DataStatsScreencollController {
     public Result usertotaldata() {
         return dataStatsScreencollService.usertotaldata();
     }
+
+
+    /**
+    * @describe: 基层党建-建设情况数据（支部、联建、志愿）
+    * @author wangtong
+    * @date 2020/8/21 18:01
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("meetdata")
+    public Result meetdata() {
+        return dataStatsScreencollService.meetdata();
+    }
+
+    /**
+    * @describe: 网格信息上传
+    * @author wangtong
+    * @date 2020/8/21 18:09
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("customergrid")
+    public Result customergrid() {
+        return dataStatsScreencollService.customergrid();
+    }
+
+    /**
+    * @describe: 组织层级
+    * @author wangtong
+    * @date 2020/8/21 18:19
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("customeragency")
+    public Result customeragency() {
+        return dataStatsScreencollService.customeragency();
+    }
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java

@@ -75,4 +75,31 @@ public interface DataStatsScreencollDao extends BaseDao<DataStatsScreencollResul
     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.UsertotaldataResultDTO>
     */
     List<UsertotaldataResultDTO> usertotaldata();
+
+    /**
+    * @describe: 基层党建-建设情况数据（支部、联建、志愿）
+    * @author wangtong
+    * @date 2020/8/21 18:03
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.MeetdataResultDTO>
+    */
+    List<MeetdataResultDTO> meetdata();
+
+    /**
+    * @describe: 网格信息上传
+    * @author wangtong
+    * @date 2020/8/21 18:18
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CustomergridResultDTO>
+    */
+    List<CustomergridResultDTO> customergrid();
+
+    /**
+    * @describe: 组织层级
+    * @author wangtong
+    * @date 2020/8/21 18:21
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CustomeragencyResultDTO>
+    */
+    List<CustomeragencyResultDTO> customeragency();
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java

@@ -56,4 +56,31 @@ public interface DataStatsScreencollService {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     Result usertotaldata();
+
+    /**
+    * @describe: 基层党建-建设情况数据（支部、联建、志愿）
+    * @author wangtong
+    * @date 2020/8/21 18:01
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result meetdata();
+
+    /**
+    * @describe: 网格信息上传
+    * @author wangtong
+    * @date 2020/8/21 18:10
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result customergrid();
+
+    /**
+    * @describe: 组织层级
+    * @author wangtong
+    * @date 2020/8/21 18:20
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result customeragency();
 }

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

@@ -58,4 +58,22 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 		List<UsertotaldataResultDTO> resultList = baseDao.usertotaldata();
 		return null;
 	}
+
+	@Override
+	public Result meetdata() {
+		List<MeetdataResultDTO> resultList = baseDao.meetdata();
+		return null;
+	}
+
+	@Override
+	public Result customergrid() {
+		List<CustomergridResultDTO> resultList = baseDao.customergrid();
+		return null;
+	}
+
+	@Override
+	public Result customeragency() {
+		List<CustomeragencyResultDTO> resultList = baseDao.customeragency();
+		return null;
+	}
 }