统计

src/main/java/com/ghsc/partybuild/controller/BigDataController.java

@@ -530,10 +530,35 @@ public class BigDataController {
         return bigDataService.getPartyUserStatusTotalList();
     }
 
-    @ResponseBody
     @GetMapping("/getZzpxqkList")
     public List<HashMap<String, Object>> getZzpxqkList() {
         return bigDataService.getZzpxqkList();
     }
 
+    @GetMapping("/getDnpxxxTotalList")
+    public List<HashMap<String, Object>> getDnpxxxTotalList() {
+        return bigDataService.getDnpxxxTotalList();
+    }
+
+    @GetMapping("/getPartyBrandTotalList")
+    public List<HashMap<String, Object>> getPartyBrandTotalList() {
+        return bigDataService.getPartyBrandTotalList();
+    }
+
+    @GetMapping("/getSzpyTotalList")
+    public List<HashMap<String, Object>> getSzpyTotalList() {
+        return bigDataService.getSzpyTotalList();
+    }
+
+    @GetMapping("/getDnghbfTotalList")
+    public List<HashMap<String, Object>> getDnghbfTotalList() {
+        return bigDataService.getDnghbfTotalList();
+    }
+
+    @GetMapping("/getZtdrTotalList")
+    public List<HashMap<String, Object>> getZtdrTotalList(Integer year) {
+        return bigDataService.getZtdrTotalList(year);
+    }
+
+
 }

src/main/java/com/ghsc/partybuild/mapper/BigDataCQuery.java

@@ -16,12 +16,14 @@ import java.util.Map;
 public interface BigDataCQuery {
     /**
      * 统计党分布信息
+     *
      * @return
      */
     List<HashMap<String, Object>> selectDzzfbqkList();
 
     /**
      * 统计党组织信息
+     *
      * @param gddwdm
      * @param province
      * @return
@@ -30,6 +32,7 @@ public interface BigDataCQuery {
 
     /**
      * 统计党委信息
+     *
      * @param gddwdm
      * @return
      */
@@ -37,6 +40,7 @@ public interface BigDataCQuery {
 
     /**
      * 统计党员数量
+     *
      * @param gddwdm
      * @return
      */
@@ -44,6 +48,7 @@ public interface BigDataCQuery {
 
     /**
      * 统计党员性别
+     *
      * @param gddwdm
      * @param dzzdm
      * @param dwgzzlb
@@ -54,6 +59,7 @@ public interface BigDataCQuery {
 
     /**
      * 统计党员年龄
+     *
      * @param gddwdm
      * @param dzzdm
      * @param dwgzzlb
@@ -64,6 +70,7 @@ public interface BigDataCQuery {
 
     /**
      * 统计党员党龄
+     *
      * @param gddwdm
      * @param dzzdm
      * @param dwgzzlb
@@ -74,6 +81,7 @@ public interface BigDataCQuery {
 
     /**
      * 统计政工职务党员
+     *
      * @param dzzdm
      * @param dwgzzlb
      * @return
@@ -82,6 +90,7 @@ public interface BigDataCQuery {
 
     /**
      * 正式和预备党员统计图
+     *
      * @param partyGroup
      * @param isOnduty
      * @return
@@ -90,6 +99,7 @@ public interface BigDataCQuery {
 
     /**
      * 统计党员学历
+     *
      * @param dzzdm
      * @param dwgzzlb
      * @param isOnduty
@@ -99,6 +109,7 @@ public interface BigDataCQuery {
 
     /**
      * 统计三会一课
+     *
      * @param dzzdm
      * @return
      */
@@ -106,6 +117,7 @@ public interface BigDataCQuery {
 
     /**
      * 党组织信息
+     *
      * @param dzzdm
      * @return
      */
@@ -113,6 +125,7 @@ public interface BigDataCQuery {
 
     /**
      * 党员信息
+     *
      * @param dzzdm
      * @return
      */
@@ -121,6 +134,7 @@ public interface BigDataCQuery {
 
     /**
      * 统计数据（党员数量、三会一课数量、中心组学习数量）
+     *
      * @param gddwdm
      * @param zzfbType
      * @param beginTime
@@ -131,6 +145,7 @@ public interface BigDataCQuery {
 
     /**
      * 发展党员
+     *
      * @param ndList
      * @return
      */
@@ -138,6 +153,7 @@ public interface BigDataCQuery {
 
     /**
      * 党组织数量
+     *
      * @param gddwdm
      * @param dzzdm
      * @param ssdzzdm
@@ -147,14 +163,16 @@ public interface BigDataCQuery {
 
     /**
      * 领导人员5+3
+     *
      * @param userCode
      * @param year
      * @return
      */
-    List<HashMap<String, Object>> selectUserLeaderTotalList(@Param("userCode") String userCode,@Param("year") String year);
+    List<HashMap<String, Object>> selectUserLeaderTotalList(@Param("userCode") String userCode, @Param("year") String year);
 
     /**
      * 中心组学习
+     *
      * @param userCode
      * @return
      */
@@ -162,6 +180,7 @@ public interface BigDataCQuery {
 
     /**
      * 党员统计
+     *
      * @param dzzdm
      * @return
      */
@@ -169,24 +188,27 @@ public interface BigDataCQuery {
 
     /**
      * 创岗建区
+     *
      * @param dzzdm
      * @param ssdzzdm
      * @param year
      * @return
      */
-    HashMap<String, Object> selectCGJQTotal(@Param("dzzdm") String dzzdm, @Param("ssdzzdm") String ssdzzdm,@Param("year") Integer year);
+    HashMap<String, Object> selectCGJQTotal(@Param("dzzdm") String dzzdm, @Param("ssdzzdm") String ssdzzdm, @Param("year") Integer year);
 
     /**
      * 创岗建区
+     *
      * @param dzzdm
      * @param ssdzzdm
      * @param year
      * @return
      */
-    List<HashMap<String, Object>> selectCGJQTotalList(@Param("dzzdm") String dzzdm, @Param("ssdzzdm") String ssdzzdm,@Param("year") Integer year);
+    List<HashMap<String, Object>> selectCGJQTotalList(@Param("dzzdm") String dzzdm, @Param("ssdzzdm") String ssdzzdm, @Param("year") Integer year);
 
     /**
      * 发展党员
+     *
      * @param dzzdm
      * @return
      */
@@ -194,24 +216,35 @@ public interface BigDataCQuery {
 
     /**
      * 中心组学习
+     *
      * @param dzzdm
      * @param ssdzzdm
      * @param year
      * @return
      */
-    List<HashMap<String, Object>> selectZXZXXTotal(@Param("dzzdm") String dzzdm, @Param("ssdzzdm") String ssdzzdm,@Param("year") Integer year);
+    List<HashMap<String, Object>> selectZXZXXTotal(@Param("dzzdm") String dzzdm, @Param("ssdzzdm") String ssdzzdm, @Param("year") Integer year);
 
     //考评信息统计
-    List<HashMap<String,Object>> selectDjkpxxTotalList(@Param("year") Integer year);
+    List<HashMap<String, Object>> selectDjkpxxTotalList(@Param("year") Integer year);
 
     //品牌信息统计
-    List<HashMap<String,Object>> selectBrandTotalList();
+    List<HashMap<String, Object>> selectBrandTotalList();
 
     //纪律处分信息
-    List<HashMap<String,Object>> selectJlcfxxTotalList();
+    List<HashMap<String, Object>> selectJlcfxxTotalList();
 
-    List<HashMap<String,Object>>selectPartyUserStatusTotalList();
+    List<HashMap<String, Object>> selectPartyUserStatusTotalList();
 
     List<HashMap<String, Object>> selectZzpxqkList();
 
+    List<HashMap<String, Object>> selectDnpxxxTotalList();
+
+    List<HashMap<String, Object>> selectPartyBrandTotalList();
+
+    List<HashMap<String, Object>> selectSzpyTotalList();
+
+    List<HashMap<String, Object>> selectDnghbfTotalList();
+
+    List<HashMap<String, Object>> selectZtdrTotalList(Integer year);
+
 }

src/main/java/com/ghsc/partybuild/service/BigDataService.java

@@ -360,4 +360,14 @@ public interface BigDataService {
 
     List<HashMap<String, Object>> getZzpxqkList();
 
+    List<HashMap<String, Object>> getDnpxxxTotalList();
+
+    List<HashMap<String, Object>> getPartyBrandTotalList();
+
+    List<HashMap<String, Object>> getSzpyTotalList();
+
+    List<HashMap<String, Object>> getDnghbfTotalList();
+
+    List<HashMap<String, Object>> getZtdrTotalList(Integer year);
+
 }

src/main/java/com/ghsc/partybuild/service/impl/BigDataServiceImpl.java

@@ -489,4 +489,117 @@ public class BigDataServiceImpl implements BigDataService {
         return result;
     }
 
+    @Override
+    public List<HashMap<String, Object>> getDnpxxxTotalList() {
+        List<HashMap<String, Object>> list = bigDataCquery.selectDnpxxxTotalList();
+
+        List<HashMap<String, Object>> result = new ArrayList<>();
+
+        Integer nowYear = dateUtils.dateToLocalDate(new Date()).getYear();
+        Integer startYear = nowYear - 4;
+
+        for (Integer year = startYear; year <= nowYear; year++) {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("year", year);
+
+            Integer finalYear = year;
+            HashMap<String, Object> dbData = list.stream().filter(e -> e.get("year").toString().equals(finalYear.toString())).findFirst().orElse(null);
+            if (dbData != null) {
+                data.put("count1", dbData.get("count1"));
+                data.put("count2", dbData.get("count2"));
+            } else {
+                data.put("count1", 0);
+                data.put("count2", 0);
+            }
+
+            result.add(data);
+        }
+
+        return result;
+    }
+
+    @Override
+    public List<HashMap<String, Object>> getPartyBrandTotalList() {
+        List<HashMap<String, Object>> list = bigDataCquery.selectPartyBrandTotalList();
+
+        List<HashMap<String, Object>> result = new ArrayList<>();
+
+        Integer nowYear = dateUtils.dateToLocalDate(new Date()).getYear();
+        Integer startYear = nowYear - 4;
+
+        for (Integer year = startYear; year <= nowYear; year++) {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("year", year);
+
+            Integer finalYear = year;
+            HashMap<String, Object> dbData = list.stream().filter(e -> e.get("year").toString().equals(finalYear.toString())).findFirst().orElse(null);
+            if (dbData != null) {
+                data.put("count", dbData.get("count"));
+            } else {
+                data.put("count", 0);
+            }
+
+            result.add(data);
+        }
+
+        return result;
+    }
+
+    @Override
+    public List<HashMap<String, Object>> getSzpyTotalList() {
+        List<HashMap<String, Object>> list = bigDataCquery.selectSzpyTotalList();
+        return list;
+    }
+
+    @Override
+    public List<HashMap<String, Object>> getDnghbfTotalList() {
+        List<HashMap<String, Object>> list = bigDataCquery.selectDnghbfTotalList();
+
+        List<HashMap<String, Object>> result = new ArrayList<>();
+
+        Integer nowYear = dateUtils.dateToLocalDate(new Date()).getYear();
+        Integer startYear = nowYear - 4;
+
+        for (Integer year = startYear; year <= nowYear; year++) {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("year", year);
+
+            Integer finalYear = year;
+            HashMap<String, Object> dbData = list.stream().filter(e -> e.get("year").toString().equals(finalYear.toString())).findFirst().orElse(null);
+            if (dbData != null) {
+                data.put("count", dbData.get("count"));
+            } else {
+                data.put("count", 0);
+            }
+
+            result.add(data);
+        }
+
+        return result;
+    }
+
+    @Override
+    public List<HashMap<String, Object>> getZtdrTotalList(Integer year) {
+        List<HashMap<String, Object>> list = bigDataCquery.selectZtdrTotalList(year);
+
+        List<HashMap<String, Object>> result = new ArrayList<>();
+
+        for (Integer month = 1; month <= 12; month++) {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("month", month + "月");
+
+            Integer finalMonth = month;
+            HashMap<String, Object> dbData = list.stream().filter(e -> e.get("month").toString().equals(finalMonth.toString())).findFirst().orElse(null);
+            if (dbData != null) {
+                data.put("count", dbData.get("count"));
+            } else {
+                data.put("count", 0);
+            }
+
+            result.add(data);
+        }
+
+        return result;
+    }
+
 }

src/main/resources/mapping/BigDataCQuery.xml

@@ -359,6 +359,7 @@
         select mt.SHYKTYPE,count(*) num from shyk_meeting m
                                        inner join shyk_meeting_type mt on m.meetingId = mt.meetingId
                                        where m.OPERATESTATE <![CDATA[ <> ]]> 'D'
+                                         and mt.shykType in (1,2,3,4)
         <if test="dzzdm != null and dzzdm != ''">
             and m.PARTYCODE like concat('',#{dzzdm},'%')
         </if>
@@ -730,6 +731,37 @@
     </select>
 
     <select id="selectZzpxqkList" resultType="java.util.HashMap">
-        select year(honourtime) as year,count(1) as count from dj_dnpxxx where pxlx=2 group by year(honourtime)
+        select year(honourtime) as year,count(1) as count from dj_dnpxxx where pxlx=2 and OPERATESTATE <![CDATA[ <> ]]> 'D' group by year(honourtime)
     </select>
+
+    <select id="selectDnpxxxTotalList" resultType="java.util.HashMap">
+        select year(honourtime) as year,
+            sum(case when honourlevel=1 then 1 else 0 end) as count1
+            , sum(case when honourlevel=2 then 1 else 0 end) as count2
+            from dj_dnpxxx where pxlx=1 and OPERATESTATE <![CDATA[ <> ]]> 'D' group by year(honourtime)
+    </select>
+    
+    <select id="selectPartyBrandTotalList" resultType="java.util.HashMap">
+        select year(BRANDTIME) as year,count(1) as count from dj_brand where OPERATESTATE <![CDATA[ <> ]]> 'D' group by year(BRANDTIME)
+    </select>
+
+    <select id="selectSzpyTotalList" resultType="java.util.HashMap">
+        select dic.DICKEY as typeValue,dic.DICVALUE as typeName,sum(case when prs.reportResult is null then 0 else 1 end) as count
+        from CF_DICTIONARY dic
+            left join pt_reportScore prs on prs.reportResult=dic.DICKEY
+            left join pt_reportdata prd on prd.reportId = prs.reportId
+            left join ZZ_ZZQKXX zz on prd.dzzdm = zz.DZZDM
+        where dic.DICTYPEKEY='reportResult'
+        group by dic.DICKEY,dic.DICVALUE
+        order by dic.DICKEY
+    </select>
+
+    <select id="selectDnghbfTotalList" resultType="java.util.HashMap">
+        select year(CAREDATE) as year,count(1) as count from dj_dnghbfmx where 1=1 group by year(CAREDATE)
+    </select>
+
+    <select id="selectZtdrTotalList" resultType="java.util.HashMap">
+        select month(ACTIVITYTIME) as month,count(1) as count from dj_ztdrxx where year(ACTIVITYTIME) = #{year} group by month(ACTIVITYTIME)
+    </select>
+
 </mapper>

src/main/resources/static/app/main/bigdata/showDjdsj/dwdt.html

@@ -20,20 +20,10 @@
 <!-- 内容区 -->
 <div class="container ct-1">
     <div class="box b-6">
-        <h1>评先评优</h1>
+        <h1>评先情况</h1>
         <!-- 图表容器 -->
         <div e-chart ec-data="pxpy_barOption" class="charts5"></div>
     </div>
-    <div class="box b-6">
-        <h1>创岗建区</h1>
-        <!-- 图表容器 -->
-        <div e-chart ec-data="cgjq_barOption" class="charts5"></div>
-    </div>
-    <div class="box b-6">
-        <h1>党内品牌</h1>
-        <!-- 图表容器 -->
-        <div e-chart ec-data="dnpp_pieOption" class="charts5"></div>
-    </div>
     <div class="box b-6">
         <h1>三会一课</h1>
         <!-- 图表容器 -->
@@ -49,14 +39,24 @@
         </div>
     </div>
     <div class="box b-6">
-        <h1>党员数量变动趋势</h1>
+        <h1>党内品牌</h1>
+        <!-- 图表容器 -->
+        <div e-chart ec-data="dnpp_barOption" class="charts5"></div>
+    </div>
+    <div class="box b-6">
+        <h1>述职评议情况</h1>
+        <!-- 图表容器 -->
+        <div e-chart ec-data="szpy_barOption" class="charts5"></div>
+    </div>
+    <div class="box b-6">
+        <h1>党内关怀帮扶情况</h1>
         <!-- 图表容器 -->
-        <div e-chart ec-data="nydt_lineOption" class="charts5"></div>
+        <div e-chart ec-data="dnghbf_barOption" class="charts5"></div>
     </div>
     <div class="box b-6">
-        <h1>党员处置情况</h1>
+        <h1>主题党日情况</h1>
         <!-- 图表容器 -->
-        <div e-chart ec-data="czqk_barOption" class="charts5"></div>
+        <div e-chart ec-data="ztdr_barOption" class="charts5"></div>
     </div>
 </div>
 <page-resizes></page-resizes>

src/main/resources/static/app/main/bigdata/showDjdsj/dwdt.js

@@ -1,6 +1,6 @@
 (function ($app) {
     'use strict';
-    $app.module('gtPartyApp').controller('showDjdsj_dwdtCtrl', function ($scope, $state, $alert, AuthUser, flowaudit, $http, $ocLazyLoad, $loading,$timeout) {
+    $app.module('gtPartyApp').controller('showDjdsj_dwdtCtrl', function ($scope, $state, $alert, AuthUser, flowaudit, $http, $ocLazyLoad, $loading, $timeout) {
 
         if (AuthUser.getUser().Id == null || AuthUser.getUser().Id == '') {
             window.location.href = "/app/main/index.html#!/login";
@@ -13,25 +13,19 @@
             $scope.pxpy_x_dataList = [];
             $scope.pxpy_y_dataList = [
                 {
-                    name: '先进基层党组织',
+                    name: '优秀党务工作者',
                     type: 'bar',
                     data: [],
-                    color: '#fff'
+                    color: '#5B9BD5'
                 },
                 {
                     name: '优秀共产党员',
                     type: 'bar',
                     data: [],
-                    color: '#fff'
-                },
-                {
-                    name: '优秀党务工作者',
-                    type: 'bar',
-                    data: [],
-                    color: '#fff'
+                    color: '#ED7D31'
                 }
             ];
-            $scope.pxpy_legend = ['先进基层党组织', '优秀共产党员', '优秀党务工作者'];
+            $scope.pxpy_legend = ['优秀党务工作者', '优秀共产党员'];
             $scope.pxpy_barOption = {
                 tooltip: {
                     trigger: 'axis',
@@ -65,7 +59,8 @@
                     },
                     splitLine: {     //网格线
                         show: false
-                    }
+                    },
+                    splitNumber: 1
                 },
                 series: $scope.pxpy_y_dataList,
                 grid: {
@@ -78,26 +73,25 @@
                 $http
                 ({
                     method: 'get',
-                    url: '../../api/bigdata/getDsjPxpyList',
+                    url: '../../api/bigdata/getDnpxxxTotalList',
                     params: {}
                 }).then(function (result) {
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val) {
-                            $scope.pxpy_x_dataList.push(val.nd);
-                            $scope.pxpy_y_dataList[0].data.push(val.xjjcdzz);
-                            $scope.pxpy_y_dataList[1].data.push(val.yxgcdy);
-                            $scope.pxpy_y_dataList[2].data.push(val.yxdwgzz);
+                            $scope.pxpy_x_dataList.push(val.year);
+                            $scope.pxpy_y_dataList[0].data.push(val.count2);
+                            $scope.pxpy_y_dataList[1].data.push(val.count1);
                         });
                     }
                 });
             };
             $scope.load_pxpy();
 
-            //创岗建区
-            $scope.cgjq_dataList = [];
-            $scope.cgjq_nameList = ['责任岗', '党员先锋岗', '责任区', '红旗责任区'];
-            ;
-            $scope.cgjq_barOption = {
+            //党内品牌
+            $scope.dnpp_dataList = [];
+            $scope.dnpp_nameList = [];
+            $scope.dnpp_barOption = {
+                color: ['#F8B551'],
                 tooltip: {
                     trigger: 'axis',
                     axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -110,7 +104,7 @@
                     axisLabel: {
                         color: '#fff'
                     },
-                    data: $scope.cgjq_nameList
+                    data: $scope.dnpp_nameList
                 },
                 yAxis: {
                     type: "value",
@@ -122,189 +116,124 @@
                     },
                     splitLine: {     //网格线
                         show: false
-                    }
+                    },
+                    splitNumber: 1
                 },
                 series: [
                     {
-                        name: '创岗建区情况',
-                        data: $scope.cgjq_dataList,
+                        name: '党内品牌',
+                        data: $scope.dnpp_dataList,
                         type: "bar",
-                        barWidth: 30,
-                        itemStyle: {
-                            normal: {
-                                color: function (params) {
-                                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE'];
-                                    return colorList[params.dataIndex];
-                                }
-                            }
-                        }
+                        barWidth: 30
                     }
                 ],
                 grid: {
                     top: 20,
-                    bottom: 20
+                    bottom: 0,
+                    containLabel: true
                 }
-            }
-            ;
-            $scope.load_cgjq = function () {
-                /*$http
+            };
+            $scope.load_dnpp = function () {
+                $http
                 ({
                     method: 'get',
-                    url: '../../api/bigdata/getDsjCgjqList',
+                    url: '../../api/bigdata/getPartyBrandTotalList',
                     params: {}
                 }).then(function (result) {
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val) {
-                            $scope.cgjq_nameList.push(val.lbmc);
-                            $scope.cgjq_dataList.push(val.sl);
+                            $scope.dnpp_nameList.push(val.year);
+                            $scope.dnpp_dataList.push(val.count);
                         });
                     }
-                });*/
-                $http
-                ({
-                    method: 'get', url: '../../api/bigdata/getCGJQTotal', params: {}
-                }).then(function (res) {
-                    $scope.cgjq_dataList.push(res.data.POSTTOTAL);
-                    $scope.cgjq_dataList.push(res.data.POSTCOUNT);
-                    $scope.cgjq_dataList.push(res.data.AREATOTAL);
-                    $scope.cgjq_dataList.push(res.data.AREACOUNT);
-
-                }, function (resp) {
-
                 });
             };
-            $scope.load_cgjq();
+            $scope.load_dnpp();
 
-            //党内品牌
-            $scope.dnpp_dataList = [];
-            $scope.dnpp_legend_dataList = [];
-            $scope.dnpp_pieOption = {
-                legend: {
-                    bottom: 0,
-                    left: 'center',
-                    data: $scope.dnpp_legend_dataList,
-                    icon: "circle",
-                    textStyle: {
+            //述职评议
+            $scope.szpy_dataList = [];
+            $scope.szpy_nameList = [];
+            $scope.szpy_barOption = {
+                color: ['#F8B551'],
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {            // 坐标轴指示器，坐标轴触发有效
+                        type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
+                    },
+                    formatter: "{a} <br/>{b} : {c}"
+                },
+                xAxis: {
+                    type: "category",
+                    axisLabel: {
                         color: '#fff'
-                    }
+                    },
+                    data: $scope.szpy_nameList
                 },
-                tooltip: {
-                    trigger: 'item',
-                    formatter: "{a} <br/>{b} : {c} ({d}%)"
+                yAxis: {
+                    type: "value",
+                    axisLabel: {
+                        color: '#fff'
+                    },
+                    axisTick: {       //y轴刻度线
+                        show: false
+                    },
+                    splitLine: {     //网格线
+                        show: false
+                    },
+                    splitNumber: 1
                 },
                 series: [
                     {
-                        name: '党内品牌',
-                        type: 'pie',
-                        avoidLabelOverlap: false,
-                        label: {
-                            normal: {
-                                show: false,
-                                position: 'center'
-                            },
-                            emphasis: {
-                                show: true,
-                                textStyle: {
-                                    fontSize: '20',
-                                    fontWeight: 'bold'
-                                }
-                            }
-                        },
-                        labelLine: {
-                            normal: {
-                                show: false
-                            }
-                        },
-                        data: $scope.dnpp_dataList
+                        name: '述职评议情况',
+                        data: $scope.szpy_dataList,
+                        type: "bar",
+                        barWidth: 30
                     }
-                ]
+                ],
+                grid: {
+                    top: 20,
+                    bottom: 0,
+                    containLabel: true
+                }
             };
-            $scope.load_dnpp = function () {
-                /*$http
-                ({
-                    method: 'get',
-                    url: '../../api/bigdata/getDsjDnppList',
-                    params: {
-                        nd: $scope.ndkpjg_nd
-                    }
-                }).then(function (result) {
-                    if (result.data != null && result.data.length > 0) {
-                        var colors = ['#4565f4', '#c4cffd', '#01588d', '#84cac8', '#019e97'];
-                        angular.forEach(result.data, function (val, index) {
-                            $scope.dnpp_legend_dataList.push(val.lbmc);
-                            $scope.dnpp_dataList.push($scope.getPieData(val.sl, val.lbmc, colors.length > index ? colors[index] : ''));
-                        });
-                    }
-                });*/
-
-                $scope.dnpp_dataList.length = 0;
+            $scope.load_szpy = function () {
                 $http
                 ({
                     method: 'get',
-                    url: '../../api/bigdata/getDjkpxxTotalList',
+                    url: '../../api/bigdata/getSzpyTotalList',
                     params: {}
                 }).then(function (result) {
-                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE', '#DCDCDC', '#F0FFFF', '#005983'];
                     if (result.data != null && result.data.length > 0) {
-                        angular.forEach(result.data, function (item, index) {
-                            $scope.dnpp_dataList.push($scope.getPieData(item.COUNT, item.NAME, colorList[index < colorList.length ? index : (colorList.length - 1)]));
-                            $scope.dnpp_legend_dataList.push(item.NAME);
+                        angular.forEach(result.data, function (val) {
+                            $scope.szpy_nameList.push(val.typeName);
+                            $scope.szpy_dataList.push(val.count);
                         });
                     }
                 });
             };
-            $scope.load_dnpp();
+            $scope.load_szpy();
 
-            //党员动态
-            $scope.nydt_x_dataList = [];
-            $scope.nydt_y_dataList = [
-                {
-                    name: '转入党员人数',
-                    type: 'line',
-                    stack: '总量',
-                    data: [],
-                    color: '#fff'
-                },
-                {
-                    name: '转出党员人数',
-                    type: 'line',
-                    stack: '总量',
-                    data: [],
-                    color: '#fff'
-                },
-                {
-                    name: '内部接转人数',
-                    type: 'line',
-                    stack: '总量',
-                    data: [],
-                    color: '#fff'
-                }
-            ];
-            $scope.nydt_lineOption = {
-                title: {
-                    text: ''
-                },
+            //党内关怀帮扶情况
+            $scope.dnghbf_dataList = [];
+            $scope.dnghbf_nameList = [];
+            $scope.dnghbf_barOption = {
+                color: ['#F8B551'],
                 tooltip: {
-                    trigger: 'axis'
-                },
-                legend: {
-                    x: 'center',
-                    y: 'bottom',
-                    data: ['转入党员人数', '转出党员人数', '内部接转人数'],
-                    textStyle: {
-                        color: '#fff'
-                    }
+                    trigger: 'axis',
+                    axisPointer: {            // 坐标轴指示器，坐标轴触发有效
+                        type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
+                    },
+                    formatter: "{a} <br/>{b} : {c}"
                 },
                 xAxis: {
-                    type: 'category',
-                    boundaryGap: false,
-                    data: $scope.nydt_x_dataList,
+                    type: "category",
                     axisLabel: {
                         color: '#fff'
-                    }
+                    },
+                    data: $scope.dnghbf_nameList
                 },
                 yAxis: {
-                    type: 'value',
+                    type: "value",
                     axisLabel: {
                         color: '#fff'
                     },
@@ -313,93 +242,58 @@
                     },
                     splitLine: {     //网格线
                         show: false
-                    }
+                    },
+                    splitNumber: 1
                 },
-                series: $scope.nydt_y_dataList,
+                series: [
+                    {
+                        name: '党内关怀帮扶情况',
+                        data: $scope.dnghbf_dataList,
+                        type: "bar",
+                        barWidth: 30
+                    }
+                ],
                 grid: {
                     top: 20,
-                    bottom: 25,
+                    bottom: 0,
                     containLabel: true
                 }
             };
-            $scope.load_nydt = function () {
+            $scope.load_dnghbf = function () {
                 $http
                 ({
                     method: 'get',
-                    url: '../../api/bigdata/getDsjDydtList',
-                    params: {
-                        nd_OrderBy: 1
-                    }
+                    url: '../../api/bigdata/getDnghbfTotalList',
+                    params: {}
                 }).then(function (result) {
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val) {
-                            $scope.nydt_x_dataList.push(val.nd);
-                            $scope.nydt_y_dataList[0].data.push(val.zr);
-                            $scope.nydt_y_dataList[1].data.push(val.zc);
-                            $scope.nydt_y_dataList[2].data.push(val.nbjz);
+                            $scope.dnghbf_nameList.push(val.year);
+                            $scope.dnghbf_dataList.push(val.count);
                         });
                     }
                 });
             };
-            $scope.load_nydt();
+            $scope.load_dnghbf();
 
-            //处置情况
-            $scope.czqk_x_dataList = [];
-            $scope.czqk_y_dataList = []/*[
-                {
-                    name: '警告',
-                    type: 'bar',
-                    data: [],
-                    color: '#4565f4'
-                },
-                {
-                    name: '严重警告',
-                    type: 'bar',
-                    data: [],
-                    color: '#c4cffd'
-                },
-                {
-                    name: '撤销党内职务',
-                    type: 'bar',
-                    data: [],
-                    color: '#01588d'
-                },
-                {
-                    name: '留党察看',
-                    type: 'bar',
-                    data: [],
-                    color: '#84cac8'
-                },
-                {
-                    name: '开除党籍',
-                    type: 'bar',
-                    data: [],
-                    color: '#005983'
-                }
-            ]*/;
-            $scope.czqk_legend = []//['警告', '严重警告', '撤销党内职务', '留党察看','开除党籍'];
-            $scope.czqk_barOption = {
+            //主题党日
+            $scope.ztdr_dataList = [];
+            $scope.ztdr_nameList = [];
+            $scope.ztdr_barOption = {
+                color: ['#F8B551'],
                 tooltip: {
                     trigger: 'axis',
-                    axisPointer: {
-                        type: 'shadow'
-                    }
-                },
-                legend: {
-                    x: 'center',
-                    y: 'bottom',
-                    data: $scope.czqk_legend,
-                    icon: "circle",
-                    textStyle: {
-                        color: '#fff'
-                    }
+                    axisPointer: {            // 坐标轴指示器，坐标轴触发有效
+                        type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
+                    },
+                    formatter: "{a} <br/>{b} : {c}"
                 },
                 xAxis: {
                     type: "category",
-                    data: $scope.czqk_x_dataList,
                     axisLabel: {
                         color: '#fff'
-                    }
+                    },
+                    data: $scope.ztdr_nameList
                 },
                 yAxis: {
                     type: "value",
@@ -411,71 +305,41 @@
                     },
                     splitLine: {     //网格线
                         show: false
-                    }
+                    },
+                    splitNumber: 1
                 },
-                series: $scope.czqk_y_dataList,
+                series: [
+                    {
+                        name: '主题党日',
+                        data: $scope.ztdr_dataList,
+                        type: "bar",
+                        barWidth: 30
+                    }
+                ],
                 grid: {
                     top: 20,
-                    bottom: 20
+                    bottom: 0,
+                    containLabel: true
                 }
             };
-            $scope.load_czqk = function () {
-                /*$http
-                ({
-                    method: 'get',
-                    url: '../../api/bigdata/getDsjCzqkList',
-                    params: {}
-                }).then(function (result) {
-                    if (result.data != null && result.data.length > 0) {
-                        angular.forEach(result.data, function (val) {
-                            $scope.czqk_x_dataList.push(val.nd);
-                            $scope.czqk_y_dataList[0].data.push(val.cpdy);
-                            $scope.czqk_y_dataList[1].data.push(val.bhgdy);
-                            $scope.czqk_y_dataList[2].data.push(val.cldbhgdy);
-                            $scope.czqk_y_dataList[3].data.push(val.cdzrs);
-                        });
-                    }
-                });*/
-
+            $scope.load_ztdr = function () {
                 $http
                 ({
                     method: 'get',
-                    url: '../../api/bigdata/getJlcfxxTotalList',
-                    params: {}
+                    url: '../../api/bigdata/getZtdrTotalList',
+                    params: {
+                        year: new Date().getFullYear()
+                    }
                 }).then(function (result) {
-                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE', '#DCDCDC', '#F0FFFF', '#005983'];
                     if (result.data != null && result.data.length > 0) {
-                        /*angular.forEach(result.data, function (item, index) {
-                            $scope.czqk_x_dataList.push(item.YEAR);
-                            $scope.czqk_y_dataList[0].data.push(item.COUNT1);
-                            $scope.czqk_y_dataList[1].data.push(item.COUNT2);
-                            $scope.czqk_y_dataList[2].data.push(item.COUNT3);
-                            $scope.czqk_y_dataList[3].data.push(item.COUNT4);
-                            $scope.czqk_y_dataList[4].data.push(item.COUNT5);
-
-                        });*/
-
-                        $.unique(result.data.map(it => it.YEAR).sort()).forEach(item => {
-                            $scope.czqk_x_dataList.push(item)
-                        });
-
-                        var types = $.unique(result.data.map(it => it.TYPE).sort());
-                        types.forEach((type, index) => {
-                            var name = result.data.filter(it => it.TYPE == type)[0].NAME;
-                            var data = result.data.filter(it => it.TYPE == type).map(it => it.COUNT);
-                            //$scope.czqk_legend.push(name);
-                            $scope.czqk_y_dataList.push({
-                                name: name,
-                                type: 'bar',
-                                data: data,
-                                color: colorList[index < colorList.length ? index : (colorList.length - 1)]
-                            })
+                        angular.forEach(result.data, function (val) {
+                            $scope.ztdr_nameList.push(val.month);
+                            $scope.ztdr_dataList.push(val.count);
                         });
-
                     }
                 });
             };
-            $scope.load_czqk();
+            $scope.load_ztdr();
 
 
             //三会一课

src/main/resources/static/app/main/index-dsj.html

@@ -126,7 +126,7 @@
                     $cbox3.css({'height': '' + WindoHeit/3-156 + 'px'});
                     $cbox3_1.css({'height': '' + WindoHeit/3-156+46 + 'px'});
                     $cbox4.css({'height': '' + WindoHeit-650 + 'px'});
-                    $cbox5.css({'height': '' + WindoHeit/3-155 + 'px'});
+                    $cbox5.css({'height': '' + WindoHeit/3-140 + 'px'});
                     $cbox6.css({'height': '' + WindoHeit-110 + 'px'});
                 };