党员分布、用户分布、月度指数-柱状图

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

@@ -1,5 +1,6 @@
 package com.epmet.screen.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -31,6 +32,7 @@ public class ParymemberDistributionResultDTO implements Serializable {
     /**
      * 坐标区域
      */
+    @JsonIgnore
     private String areaMarks = "";
 
     /**

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

@@ -1,5 +1,6 @@
 package com.epmet.screen.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -31,6 +32,7 @@ public class UserDistributionResultDTO implements Serializable {
     /**
      * 坐标区域
      */
+    @JsonIgnore
     private String areaMarks;
 
     /**

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

@@ -30,7 +30,7 @@ public class UserResultDTO implements Serializable {
      * 当前所选组织的坐标区域
      */
     @JsonIgnore
-    private String areaMarks = "";
+    private String areaMarks;
 
     /**
      * 机关级别

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

@@ -67,9 +67,9 @@ public class IndexController {
      */
     //@ExternalAppRequestAuth
     @PostMapping("monthindexanalysis/barchart")
-    public Result<MonthBarchartResultDTO> monthBarchart(@RequestBody MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam){
+    public Result<MonthBarchartResultDTO> monthBarchart(@RequestBody MonthBarchartFormDTO monthBarchartFormDTO){
         ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class);
-        return new Result<MonthBarchartResultDTO>().ok(indexService.monthBarchart(monthBarchartFormDTO,externalAppRequestParam));
+        return new Result<MonthBarchartResultDTO>().ok(indexService.monthBarchart(monthBarchartFormDTO));
     }
 
     /**

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

@@ -46,12 +46,11 @@ public interface ScreenIndexDataMonthlyDao{
 
     /**
      * @Description  查询近一年的指数值【不包括本月】
-     * @param customerId
      * @param agencyId
      * @author zxc
      * @date 2020/8/20 9:02 上午
      */
-    List<MonthBarchartResult> selectMonthBarchart(@Param("customerId")String customerId, @Param("agencyId")String agencyId);
+    List<MonthBarchartResult> selectMonthBarchart(@Param("agencyId")String agencyId);
 
     /**
      * @Description  4、下级部门指数排行

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

@@ -1,6 +1,5 @@
 package com.epmet.datareport.service.screen;
 
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.screen.dto.form.MonthBarchartFormDTO;
 import com.epmet.screen.dto.form.MonthPieChartFormDTO;
 import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
@@ -42,7 +41,7 @@ public interface IndexService {
      * @author zxc
      * @date 2020/8/19 5:27 下午
      */
-    MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam);
+    MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO);
 
     /**
      * @Description  4、下级部门指数排行

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

@@ -77,12 +77,7 @@ public class IndexServiceImpl implements IndexService {
      */
     @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
-    public MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam) {
-
-//        String customerId = externalAppRequestParam.getCustomerId();
-
-        // 验签关闭，customerId无法获取，暂时写死
-        String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
+    public MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO) {
         MonthBarchartResultDTO result = new MonthBarchartResultDTO();
         List<Double> serviceAbilityData = new ArrayList<>();
         List<Double> partyDevAbilityData = new ArrayList<>();
@@ -91,7 +86,7 @@ public class IndexServiceImpl implements IndexService {
         // 1. x轴
         result.setXAxis(partyMemberLeadServiceImpl.getXPro());
         // 2. 查询近一年的指数值【不包括本月】
-        List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(customerId, monthBarchartFormDTO.getAgencyId());
+        List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId());
         if (monthBarchartResults.size() == NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) {
                 serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO);

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

@@ -31,7 +31,6 @@
         WHERE
             del_flag = '0'
             AND org_id = #{agencyId}
-            AND customer_id = #{customerId}
             ORDER BY MONTH_ID DESC
             LIMIT 12
     </select>