2、党员联系群众

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ContactMassLineChartFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/20 2:28 下午
+ */
+@Data
+public class ContactMassLineChartFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 5627978767044772204L;
+
+    public interface ContactMassLineChart{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {ContactMassLineChart.class})
+    private String agencyId;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/FineExampleFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/20 1:46 下午
+ */
+@Data
+public class FineExampleFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -5402747414542735700L;
+
+    public interface FineExample{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {FineExample.class})
+    private String agencyId;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResult.java

@@ -0,0 +1,30 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/20 2:45 下午
+ */
+@Data
+public class ContactMassLineChartResult implements Serializable {
+
+    private static final long serialVersionUID = 5668549816473850787L;
+
+    /**
+     * 组织名称
+     */
+    private String orgName;
+
+    /**
+     * 党员建群数
+     */
+    private Integer groupTotal;
+
+    /**
+     * 群成员数
+     */
+    private Integer userTotal;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResultDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/20 2:31 下午
+ */
+@Data
+public class ContactMassLineChartResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 192666933158635787L;
+
+    /**
+     * 横坐标集合
+     */
+    private List<String> xAxis;
+
+    /**
+     * 党员建群数
+     */
+    private List<Integer> groupData;
+
+    /**
+     * 群成员数
+     */
+    private List<Integer> groupMemberData;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/FineExampleResultDTO.java

@@ -0,0 +1,55 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/20 1:48 下午
+ */
+@Data
+public class FineExampleResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2754696449087950719L;
+
+    /**
+     * 党员参与议题数
+     */
+    private Integer issueTotal;
+
+    /**
+     * 党员参与议题书占平台议题数的占比
+     */
+    private String issueRatio;
+
+    /**
+     * 党员发布话题总数
+     */
+    private Integer topicTotal;
+
+    /**
+     * 占平台总话题百分比
+     */
+    private String topicRatio;
+
+    /**
+     * 议题转项目
+     */
+    private Integer shiftProjectTotal;
+
+    /**
+     * 议题转项目占平台总项目数的比率
+     */
+    private String shiftProjectRatio;
+
+    /**
+     * 解决项目
+     */
+    private Integer resolvedProjectTotal;
+
+    /**
+     * 占总解决项目的百分比
+     */
+    private String resolvedProjectRatio;
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java

@@ -1,5 +1,16 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.screen.PartyMemberLeadService;
+import com.epmet.screen.dto.form.ContactMassLineChartFormDTO;
+import com.epmet.screen.dto.form.FineExampleFormDTO;
+import com.epmet.screen.dto.result.ContactMassLineChartResultDTO;
+import com.epmet.screen.dto.result.FineExampleResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,4 +23,34 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/screen/partymemberlead")
 public class PartyMemberLeadController {
+
+    @Autowired
+    private PartyMemberLeadService partyMemberLeadService;
+
+    /**
+     * @Description  1、先锋模范
+     * @param fineExampleFormDTO
+     * @author zxc
+     * @date 2020/8/20 1:56 下午
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("fineexample")
+    public Result<FineExampleResultDTO> fineExample(@RequestBody FineExampleFormDTO fineExampleFormDTO){
+        ValidatorUtils.validateEntity(fineExampleFormDTO, FineExampleFormDTO.FineExample.class);
+        return new Result<FineExampleResultDTO>().ok(partyMemberLeadService.fineExample(fineExampleFormDTO));
+    }
+
+    /**
+     * @Description  2、党员联系群众
+     * @param contactMassLineChartFormDTO
+     * @author zxc
+     * @date 2020/8/20 2:35 下午
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("contactmasslinechart")
+    public Result<ContactMassLineChartResultDTO> contactMassLineChart(@RequestBody ContactMassLineChartFormDTO contactMassLineChartFormDTO){
+        ValidatorUtils.validateEntity(contactMassLineChartFormDTO, ContactMassLineChartFormDTO.ContactMassLineChart.class);
+        return new Result<ContactMassLineChartResultDTO>().ok(partyMemberLeadService.contactMassLineChart(contactMassLineChartFormDTO));
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyLinkMassesDataDao.java

@@ -17,7 +17,11 @@
 
 package com.epmet.datareport.dao.screen;
 
+import com.epmet.screen.dto.result.ContactMassLineChartResult;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 党建引领-党员联系群众数据
@@ -28,4 +32,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenPartyLinkMassesDataDao  {
 
+    /**
+     * @Description  查询党员联系群众
+     * @param agencyId
+     * @author zxc
+     * @date 2020/8/20 2:48 下午
+     */
+    List<ContactMassLineChartResult> selectContactMassLineChart(@Param("agencyId")String agencyId);
+	
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/PartyMemberLeadService.java

@@ -1,5 +1,10 @@
 package com.epmet.datareport.service.screen;
 
+import com.epmet.screen.dto.form.ContactMassLineChartFormDTO;
+import com.epmet.screen.dto.form.FineExampleFormDTO;
+import com.epmet.screen.dto.result.ContactMassLineChartResultDTO;
+import com.epmet.screen.dto.result.FineExampleResultDTO;
+
 /**
  * 党建引领相关各指标查询
  *
@@ -7,4 +12,21 @@ package com.epmet.datareport.service.screen;
  * @date 2020/8/18 10:22
  */
 public interface PartyMemberLeadService {
+
+    /**
+     * @Description  1、先锋模范
+     * @param fineExampleFormDTO
+     * @author zxc
+     * @date 2020/8/20 1:56 下午
+     */
+    FineExampleResultDTO fineExample(FineExampleFormDTO fineExampleFormDTO);
+
+    /**
+     * @Description  2、党员联系群众
+     * @param contactMassLineChartFormDTO
+     * @author zxc
+     * @date 2020/8/20 2:35 下午
+     */
+    ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO);
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java

@@ -1,8 +1,23 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
+import com.epmet.datareport.dao.screen.ScreenPartyLinkMassesDataDao;
 import com.epmet.datareport.service.screen.PartyMemberLeadService;
+import com.epmet.screen.dto.form.ContactMassLineChartFormDTO;
+import com.epmet.screen.dto.form.FineExampleFormDTO;
+import com.epmet.screen.constant.*;
+import com.epmet.screen.dto.result.CompartmentResultDTO;
+import com.epmet.screen.dto.result.ContactMassLineChartResult;
+import com.epmet.screen.dto.result.ContactMassLineChartResultDTO;
+import com.epmet.screen.dto.result.FineExampleResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 党建引领相关各指标查询
  *
@@ -11,4 +26,49 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
+
+    @Autowired
+    private ScreenPartyLinkMassesDataDao screenPartyLinkMassesDataDao;
+
+    /**
+     * @Description  1、先锋模范
+     * @param fineExampleFormDTO
+     * @author zxc
+     * @date 2020/8/20 1:56 下午
+     */
+    @Override
+    public FineExampleResultDTO fineExample(FineExampleFormDTO fineExampleFormDTO) {
+
+        return null;
+    }
+
+    /**
+     * @Description  2、党员联系群众
+     * @param contactMassLineChartFormDTO
+     * @author zxc
+     * @date 2020/8/20 2:35 下午
+     */
+    @Override
+    public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) {
+        ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO();
+        List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChart(contactMassLineChartFormDTO.getAgencyId());
+        if (contactMassLineChartResults.size() == NumConstant.ZERO){
+            result.setXAxis(new ArrayList<>());
+            result.setGroupMemberData(new ArrayList<>());
+            result.setGroupData(new ArrayList<>());
+            return result;
+        }
+        List<String> xAxis = new ArrayList<>();
+        List<Integer> groupData = new ArrayList<>();
+        List<Integer> groupMemberData = new ArrayList<>();
+        contactMassLineChartResults.forEach(contact -> {
+            xAxis.add(contact.getOrgName());
+            groupData.add(contact.getGroupTotal());
+            groupMemberData.add(contact.getUserTotal());
+        });
+        result.setXAxis(xAxis);
+        result.setGroupData(groupData);
+        result.setGroupMemberData(groupMemberData);
+        return result;
+    }
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml

@@ -3,6 +3,16 @@
 
 <mapper namespace="com.epmet.datareport.dao.screen.ScreenPartyLinkMassesDataDao">
 
-
+    <!-- 查询党员联系群众 -->
-
+    <select id="selectContactMassLineChart" resultType="com.epmet.screen.dto.result.ContactMassLineChartResult">
+        SELECT
+            org_name AS orgName,
+            create_group_total AS groupTotal,
+            group_user_total AS userTotal
+        FROM
+            screen_party_link_masses_data
+        WHERE
+            del_flag = '0'
+            AND parent_id = #{agencyId}
+    </select>
 </mapper>