Merge remote-tracking branch 'origin/master'

lib/数据更新脚本.txt

@@ -198,3 +198,32 @@ INSERT INTO CF_DICTIONARY (DICTIONARYID, DICKEY, DICVALUE, DICTYPEKEY, DICTYPE,
 -- 2024.7.19
 alter table cf_users add wxUserId varchar(50);
 
+-- 2024.7.22
+delete from zzzd_jczzflnew;
+
+insert into zzzd_jczzflnew
+values('100','党委',10,null,null,null);
+insert into zzzd_jczzflnew
+values('200','院系',20,null,null,null);
+insert into zzzd_jczzflnew
+values('300','综合',30,null,null,null);
+insert into zzzd_jczzflnew
+values('400','离退休',40,null,null,null);
+insert into zzzd_jczzflnew
+values('500','其他',50,null,null,null);
+
+update zz_zzqkxxfb set JCZZFL=null;
+
+update zz_zzqkxxfb fb
+inner join zz_zzqkxx p on  p.dzzdm = fb.dzzdm
+set fb.JCZZFL='100' where p.dzzmc like '%党委%';
+update zz_zzqkxxfb fb
+inner join zz_zzqkxx p on  p.dzzdm = fb.dzzdm
+set fb.JCZZFL='300' where p.dzzmc like '%综合%';
+update zz_zzqkxxfb fb
+inner join zz_zzqkxx p on  p.dzzdm = fb.dzzdm
+set fb.JCZZFL='400' where p.dzzmc like '%离退休%';
+update zz_zzqkxxfb fb
+inner join zz_zzqkxx p on  p.dzzdm = fb.dzzdm
+set fb.JCZZFL='200' where fb.JCZZFL is null;
+

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

@@ -525,4 +525,9 @@ public class BigDataController {
         return bigDataService.getJlcfxxTotalList();
     }
 
+    @GetMapping("/getPartyUserStatusTotalList")
+    public List<HashMap<String, Object>> getPartyUserStatusTotalList(){
+        return bigDataService.getPartyUserStatusTotalList();
+    }
+
 }

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

@@ -210,4 +210,6 @@ public interface BigDataCQuery {
     //纪律处分信息
     List<HashMap<String,Object>> selectJlcfxxTotalList();
 
+    List<HashMap<String,Object>>selectPartyUserStatusTotalList();
+
 }

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

@@ -16,6 +16,7 @@ public interface BigDataService {
 
     /**
      * 查询大数据-党员动态
+     *
      * @param nd
      * @param ndOrderBy
      * @return
@@ -24,6 +25,7 @@ public interface BigDataService {
 
     /**
      * 保存大数据-党员动态
+     *
      * @param dsjDydtList
      * @return
      */
@@ -31,6 +33,7 @@ public interface BigDataService {
 
     /**
      * 查询大数据-评先评优
+     *
      * @param nd
      * @return
      */
@@ -38,6 +41,7 @@ public interface BigDataService {
 
     /**
      * 保存大数据-评先评优
+     *
      * @param dsjPxpyList
      * @return
      */
@@ -45,6 +49,7 @@ public interface BigDataService {
 
     /**
      * 查询大数据-处置情况
+     *
      * @param nd
      * @return
      */
@@ -52,6 +57,7 @@ public interface BigDataService {
 
     /**
      * 保存大数据-处置情况
+     *
      * @param dsjCzqkList
      * @return
      */
@@ -59,12 +65,14 @@ public interface BigDataService {
 
     /**
      * 查询大数据-党内品牌
+     *
      * @return
      */
     List<DsjDnpp> getDsjDnppList();
 
     /**
      * 保存大数据-党内品牌
+     *
      * @param dsjDnppList
      * @return
      */
@@ -72,12 +80,14 @@ public interface BigDataService {
 
     /**
      * 查询大数据-创岗建区
+     *
      * @return
      */
     List<DsjCgjq> getDsjCgjqList();
 
     /**
      * 保存大数据-创岗建区
+     *
      * @param dsjCgjqList
      * @return
      */
@@ -85,12 +95,14 @@ public interface BigDataService {
 
     /**
      * 查询大数据-发展党员情况
+     *
      * @return
      */
     List<DsjFzdyqk> getDsjFzdyqkList();
 
     /**
      * 保存大数据-发展党员情况
+     *
      * @param dsjFzdyqkList
      * @return
      */
@@ -98,6 +110,7 @@ public interface BigDataService {
 
     /**
      * 查询大数据-年度考评结果
+     *
      * @param nd
      * @return
      */
@@ -105,6 +118,7 @@ public interface BigDataService {
 
     /**
      * 保存大数据-年度考评结果
+     *
      * @param dsjNdkpjgList
      * @return
      */
@@ -113,12 +127,14 @@ public interface BigDataService {
 
     /**
      * 查询党组织分布情况
+     *
      * @return
      */
     List<HashMap<String, Object>> getDzzfbqkList();
 
     /**
      * 统计党组织信息
+     *
      * @param province
      * @return
      */
@@ -126,6 +142,7 @@ public interface BigDataService {
 
     /**
      * 统计党委信息
+     *
      * @param province
      * @return
      */
@@ -133,6 +150,7 @@ public interface BigDataService {
 
     /**
      * 统计党员信息
+     *
      * @param province
      * @return
      */
@@ -140,6 +158,7 @@ public interface BigDataService {
 
     /**
      * 统计党员性别
+     *
      * @param dzzdm
      * @param dwgzzlb
      * @param isOnduty
@@ -149,6 +168,7 @@ public interface BigDataService {
 
     /**
      * 统计党员年龄
+     *
      * @param dzzdm
      * @param dwgzzlb
      * @param isOnduty
@@ -158,6 +178,7 @@ public interface BigDataService {
 
     /**
      * 统计党员党龄
+     *
      * @param dzzdm
      * @param dwgzzlb
      * @param isOnduty
@@ -167,6 +188,7 @@ public interface BigDataService {
 
     /**
      * 统计政工职务党员
+     *
      * @param dzzdm
      * @param dwgzzlb
      * @return
@@ -175,6 +197,7 @@ public interface BigDataService {
 
     /**
      * 人员状态
+     *
      * @param partyGroup
      * @param isOnduty
      * @return
@@ -184,6 +207,7 @@ public interface BigDataService {
 
     /**
      * 统计党员学历
+     *
      * @param dzzdm
      * @param dwgzzlb
      * @param isOnduty
@@ -193,6 +217,7 @@ public interface BigDataService {
 
     /**
      * 统计三会一课
+     *
      * @param dzzdm
      * @return
      */
@@ -200,6 +225,7 @@ public interface BigDataService {
 
     /**
      * 统计党组织分类信息
+     *
      * @param dzzdm
      * @return
      */
@@ -207,6 +233,7 @@ public interface BigDataService {
 
     /**
      * 党员信息
+     *
      * @param dzzdm
      * @return
      */
@@ -214,6 +241,7 @@ public interface BigDataService {
 
     /**
      * 统计党建
+     *
      * @param page
      * @param rows
      * @param zzfbType
@@ -221,10 +249,11 @@ public interface BigDataService {
      * @param endTime
      * @return
      */
-    PageInfo<HashMap<String, Object>> getAllDataTotal(int page, int rows, Integer zzfbType,String beginTime, String endTime);
+    PageInfo<HashMap<String, Object>> getAllDataTotal(int page, int rows, Integer zzfbType, String beginTime, String endTime);
 
     /**
      * 发展党员情况
+     *
      * @param nd
      * @return
      */
@@ -232,6 +261,7 @@ public interface BigDataService {
 
     /**
      * 保存
+     *
      * @param dsjNdkpjgList
      * @return
      */
@@ -239,6 +269,7 @@ public interface BigDataService {
 
     /**
      * get
+     *
      * @param ndList
      * @return
      */
@@ -246,22 +277,25 @@ public interface BigDataService {
 
     /**
      * 党组织统计
+     *
      * @param dzzdm
      * @param ssdzzdm
      * @return
      */
-    List<HashMap<String, Object>> getPartyCountList(String dzzdm,String ssdzzdm);
+    List<HashMap<String, Object>> getPartyCountList(String dzzdm, String ssdzzdm);
 
     /**
      * 领导人员5+3
+     *
      * @param userCode
      * @param year
      * @return
      */
-    List<HashMap<String, Object>> getUserLeaderTotalList(String userCode,String year);
+    List<HashMap<String, Object>> getUserLeaderTotalList(String userCode, String year);
 
     /**
      * 中心组学习
+     *
      * @param userCode
      * @return
      */
@@ -269,6 +303,7 @@ public interface BigDataService {
 
     /**
      * 党员
+     *
      * @param dzzdm
      * @return
      */
@@ -276,6 +311,7 @@ public interface BigDataService {
 
     /**
      * 创岗建区
+     *
      * @param dzzdm
      * @param ssdzzdm
      * @param year
@@ -285,6 +321,7 @@ public interface BigDataService {
 
     /**
      * 创岗建区
+     *
      * @param dzzdm
      * @param ssdzzdm
      * @param year
@@ -294,6 +331,7 @@ public interface BigDataService {
 
     /**
      * 发展党员
+     *
      * @param dzzdm
      * @return
      */
@@ -301,6 +339,7 @@ public interface BigDataService {
 
     /**
      * 中心组学习
+     *
      * @param dzzdm
      * @param ssdzzdm
      * @param year
@@ -317,4 +356,6 @@ public interface BigDataService {
     //纪律处分信息
     List<HashMap<String, Object>> getJlcfxxTotalList();
 
+    List<HashMap<String, Object>> getPartyUserStatusTotalList();
+
 }

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

@@ -456,4 +456,9 @@ public class BigDataServiceImpl implements BigDataService {
         return bigDataCquery.selectJlcfxxTotalList();
     }
 
+    @Override
+    public List<HashMap<String,Object>>getPartyUserStatusTotalList(){
+        return bigDataCquery.selectPartyUserStatusTotalList();
+    }
+
 }

src/main/resources/mapping/BigDataCQuery.xml

@@ -55,7 +55,10 @@
        sum(case when fb.ZZLB = '300' then 1 else 0 end)                           as DZZSL, -- 党总支数量
        sum(case when fb.ZZLB = '400' then 1 else 0 end)                           as DZBSL, -- 党支部数量
        sum(case when fb.ZZLB = '300' and fzp.FZMC is not null then 1 else 0 end)  as DZZSL_YSZD,-- 党总支-运输站段数量
-       sum(case when fb.ZZLB = '400' and fzp.FZMC is not null then 1 else 0 end)  as DZBSL_YSZD -- 党支部-运输站段数量
+       sum(case when fb.ZZLB = '400' and fzp.FZMC is not null then 1 else 0 end)  as DZBSL_YSZD, -- 党支部-运输站段数量
+       sum(case when fb.ZZLB = '400' and fb.JCZZFL='200' then 1 else 0 end)  as DZBSL_YX, -- 党支部-院系
+       sum(case when fb.ZZLB = '400' and fb.JCZZFL='300' then 1 else 0 end)  as DZBSL_ZH, -- 党支部-综合
+       sum(case when fb.ZZLB = '400' and fb.JCZZFL='400' then 1 else 0 end)  as DZBSL_LTX -- 党支部-离退休
        from ZZ_ZZQKXX zz
        inner join ZZ_ZZQKXXFB fb on zz.DZZDM = fb.DZZDM
        left join DJZZRS_FZJGGL zzfz on SUBSTR(zz.DZZDM, 1, 12) = zzfz.DZZBM and zzfz.JGFZID is not null
@@ -379,11 +382,13 @@
         select dic.DICKEY SHYKTYPE,dic.DICVALUE SHYKTYPENAME,ifnull(m.num,0) NUM
         from (select * from cf_dictionary where DICTYPEKEY='shykType' and OPERATESTATE <![CDATA[ <> ]]> 'D') dic
         left join (
-        select m.SHYKTYPE,count(*) num from shyk_meeting m where m.OPERATESTATE <![CDATA[ <> ]]> 'D'
+        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'
         <if test="dzzdm != null and dzzdm != ''">
             and m.PARTYCODE like concat('',#{dzzdm},'%')
         </if>
-        group by m.SHYKTYPE
+        group by mt.SHYKTYPE
         ) m on dic.DICKEY=m.SHYKTYPE
         order by dic.DICKEY
     </select>
@@ -736,4 +741,17 @@
         group by t.NAME, t.TYPE, t.YEAR
         order by t.YEAR,t.TYPE, t.YEAR
     </select>
+
+    <select id="selectPartyUserStatusTotalList" resultType="java.util.HashMap">
+        select t.partyCode,t.partyName,fb.zzlb as partyType,t.userStatus,t.userStatusName
+             ,sum(case when us.rybm is not null then 1 else 0 end) as userCount
+        from (
+                 select p.dzzdm as partyCode,p.dzzmc as partyName,t.bm as userStatus,t.hzmc as userStatusName from zz_zzqkxx p,zzzd_ryzt t
+             ) t
+                 inner join zz_zzqkxxfb fb on t.partyCode = fb.dzzdm
+                 left join vm_ryjbxx_all us on substr(us.szdzbdm,1,length(t.partyCode)) = t.partyCode
+                 left join rs_ryjbxxfb usfb on us.rybm = usfb.rybm
+        where 1=1 and (usfb.ISARCHIVE is null or usfb.ISARCHIVE = 0)
+        group by t.partyCode,t.partyName,fb.zzlb,t.userStatus,t.userStatusName
+    </select>
 </mapper>

src/main/resources/mapping/PartyTotalCQuery.xml

@@ -229,7 +229,8 @@
         sum(case when us.RYZT ='3' then 1 else 0 end) as NUM_ZSDY -- 正式党员
         from VM_RYJBXX_ALL us
         inner join ZZ_ZZQKXX z on us.SZDZBDM=z.DZZDM
-        where 1=1
+        inner join rs_ryjbxxfb fb on us.rybm = fb.rybm
+        where 1=1 and (fb.ISARCHIVE is null or fb.ISARCHIVE = 0)
         <if test="isOnduty != null">
             /*是否在岗*/
             <if test="isOnduty == 1">

src/main/resources/mapping/PartyTwoCQuery.xml

@@ -501,7 +501,7 @@
             and p.kzpyrq <![CDATA[ >= ]]> #{beginTime}
         </if>
         <if test="endTime != null and endTime != '' ">
-            and p.kzpyrq <![CDATA[ <= ]]> #{endTime}
+            and p.jspyrq <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="username!=null and username !=''">
             and ry.xm like concat('%',#{username},'%')

src/main/resources/static/app/main/bigdata/showDjdsj/css/style.css

@@ -29,8 +29,8 @@
 	box-shadow:inset 0 0 1px #FFF3B3,inset 0 0 20px rgba(248,181,81,.2);
 	position: relative;
 }
-.b-1{ height: 570px; overflow: hidden;}
-.b-2{ height: 480px; top:90px; }
+.b-1{ height: 540px; overflow: hidden;}
+.b-2{ height: 450px; top:90px; }
 
 .box-header{ width:300px; height: 82px; background: url(../images/icon-1.png) no-repeat 0 center; position: relative; left: 50%; margin: 20px 0 30px -150px;}
 .bh-2{ background: url(../images/icon-2.png) no-repeat 0 center; }

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

@@ -25,19 +25,19 @@
             <div class="box-1-list">
                 <table>
                     <tr>
-                        <th rowspan="2">党委</th>
-                        <td style="width:90px;">一级党委</td>
-                        <td>二级党委</td>
-                        <td>占比</td>
+                        <th rowspan="2">组织分布</th>
+                        <td style="width:90px;">综合支部</td>
+                        <td>院系支部</td>
+                        <td>离退休</td>
                     </tr>
                     <tr>
-                        <td class="t-number">{{dwxx.YJDWSL}}</td>
-                        <td class="t-number">{{dwxx.EJDWSL}}</td>
-                        <td class="t-number">{{(((dwxx.YJDWSL+dwxx.EJDWSL)/dwxx.DZZZS)|number:3)*100}}%</td>
+                        <td class="t-number">{{dwxx.DZBSL_ZH}}</td>
+                        <td class="t-number">{{dwxx.DZBSL_YX}}</td>
+                        <td class="t-number">{{dwxx.DZBSL_LTX}}</td>
                     </tr>
                 </table>
             </div>
-            <div class="box-1-list">
+            <!--<div class="box-1-list">
                 <table>
                     <tr>
                         <th rowspan="2">党工委</th>
@@ -79,12 +79,17 @@
                         <td class="t-number">{{((dwxx.DZBSL/dwxx.DZZZS)|number:3)*100}}%</td>
                     </tr>
                 </table>
+            </div>-->
+            <div class="box b-3">
+                <h1>组织评先情况</h1>
+                <!-- 图表容器 -->
+                <div e-chart ec-data="dzzfbqk_barOption" class="charts2"></div>
             </div>
         </div>
-        <div class="box b-3">
-            <h1>党组织分布情况</h1>
+        <div class="box b-3" style="height: calc(100% - 545px);">
+            <h1>三会一课</h1>
             <!-- 图表容器 -->
-            <div e-chart ec-data="dzzfbqk_barOption" class="charts"></div>
+            <div e-chart ec-data="shyk_pieOption" class="charts2"></div>
         </div>
     </div>
 
@@ -108,88 +113,21 @@
             </div>
 
             <div class="map-content">
-                <div class="map-box">
-                    <h3>广东</h3>
-                    <div class="map guangdong"></div>
-                    <ul class="map-items">
-                        <li>
-                            <span>党组织</span>
-                            <h1>{{dzz_GuangDong.DZZSL}}</h1>
-                        </li>
-                        <li>
-                            <span>党支部</span>
-                            <h1>{{dzz_GuangDong.DZBSL}}</h1>
-                        </li>
-                        <li>
-                            <span>党员</span>
-                            <h1>{{dzz_GuangDong.DYSL}}</h1>
-                        </li>
-                    </ul>
-
-                </div>
-                <div class="map-box">
-                    <h3>湖南</h3>
-                    <div class="map hunan"></div>
-                    <ul class="map-items">
-                        <li>
-                            <span>党组织</span>
-                            <h1>{{dzz_HuNan.DZZSL}}</h1>
-                        </li>
-                        <li>
-                            <span>党支部</span>
-                            <h1>{{dzz_HuNan.DZBSL}}</h1>
-                        </li>
-                        <li>
-                            <span>党员</span>
-                            <h1>{{dzz_HuNan.DYSL}}</h1>
-                        </li>
-                    </ul>
-
-                </div>
-                <div class="map-box">
-                    <h3>海南</h3>
-                    <div class="map hainan"></div>
-                    <ul class="map-items">
-                        <li>
-                            <span>党组织</span>
-                            <h1>{{dzz_HaiNan.DZZSL}}</h1>
-                        </li>
-                        <li>
-                            <span>党支部</span>
-                            <h1>{{dzz_HaiNan.DZBSL}}</h1>
-                        </li>
-                        <li>
-                            <span>党员</span>
-                            <h1>{{dzz_HaiNan.DYSL}}</h1>
-                        </li>
-                    </ul>
-
+                <div class="box">
+                    <!-- 图表容器 -->
+                    <div e-chart ec-data="dyTotal_barOption" style="height: 300px !important;"></div>
                 </div>
             </div>
         </div>
 
-        <div class="bottom">
-            <div class="box b-4">
-                <h1>基层单位党组织年度考评结果</h1>
-                <!-- 年份 -->
-                <div select-filter class="filter-box" ng-model="selectparam.ndkpjg_nd">
-                    <div class="filter-text">
-                        <input class="filter-title" type="text" readonly placeholder=""/>
-                        <i class="icon icon-filter-arrow"></i>
-                    </div>
-                    <select name="filter">
-                        <option ng-repeat="type in yearList" value="{{type.dickey}}"
-                                ng-selected="selectparam.ndkpjg_nd==type.dickey">{{type.dicvalue}}
-                        </option>
-                    </select>
+        <div class="bottom" style="height: calc(100% - 175px);">
+            <div class="box b-5 b-all" style="width: 100%;margin: 0px;">
+                <h1>发展党员</h1>
+                <div class="text-all">
+                    <p>入党申请人数：<h2>{{dyxx.sqrds}}</h2></p>
                 </div>
                 <!-- 图表容器 -->
-                <div e-chart ec-data="ndkpjg_pieOption" class="charts"></div>
-            </div>
-            <div class="box b-4" style="float: right;">
-                <h1>党员流动</h1>
-                <!-- 图表容器 -->
-                <div e-chart ec-data="nydt_lineOption" class="charts"></div>
+                <div e-chart ec-data="fzdyqk_barOption" class="charts2"></div>
             </div>
         </div>
     </div>
@@ -240,71 +178,11 @@
                 </table>
             </div>
         </div>
-        <div class="box b-3">
-            <h1>发展党员</h1>
-            <p>
-                <span>入党申请人数 </span>
-            <h2>{{dyxx[7].NUM}}</h2>
-            </p>
+        <div class="box b-3" style="height: calc(100% - 545px);">
+            <h1>性别情况</h1>
             <!-- 图表容器 -->
-            <div e-chart ec-data="fzdyqk_barOption" class="charts2"></div>
+            <div e-chart ec-data="dyxb_pieOption" class="charts2"></div>
         </div>
     </div>
 </div>
-<page-resizes></page-resizes>
-<!--
-<div e-chart ec-data="dzzfbqk_barOption" style='width: auto; height: 550px;'></div>
-<div e-chart ec-data="ndkpjg_pieOption" style='width: auto; height: 550px;'></div>
-<div e-chart ec-data="nydt_lineOption" style='width: auto; height: 550px;'></div>
-<div e-chart ec-data="fzdyqk_barOption" style='width: auto; height: 550px;'></div>
-<br>
-党组织：{{dzz_total.DZZSL}} 党支部：{{dzz_total.DZBSL}} 党员：{{dzz_total.DYSL}}
-<br>
-广东-&#45;&#45;党组织：{{dzz_GuangDong.DZZSL}} 党支部：{{dzz_GuangDong.DZBSL}} 党员：{{dzz_GuangDong.DYSL}}
-<br>
-湖南-&#45;&#45;党组织：{{dzz_HuNan.DZZSL}} 党支部：{{dzz_HuNan.DZBSL}} 党员：{{dzz_HuNan.DYSL}}
-<br>
-海南-&#45;&#45;党组织：{{dzz_HaiNan.DZZSL}} 党支部：{{dzz_HaiNan.DZBSL}} 党员：{{dzz_HaiNan.DYSL}}
-<br>
-<br>
-党组织：{{dwxx.DZZZS}}
-<br>
-党委：
-一级党委：{{dwxx.YJDWSL}}
-二级党委：{{dwxx.EJDWSL}}
-占比：{{(((dwxx.YJDWSL+dwxx.EJDWSL)/dwxx.DZZZS)|number:3)*100}}%
-<br>
-党委数量：{{dwxx.DWSL}}
-<br>
-党工委数量：{{dwxx.DGWSL}}
-占比：{{((dwxx.DGWSL/dwxx.DZZZS)|number:3)*100}}%
-<br>
-党总支数量：{{dwxx.DZZSL}}
-其中运输站段：{{dwxx.DZZSL_YSZD}}
-占比：{{((dwxx.DZZSL/dwxx.DZZZS)|number:3)*100}}%
-<br>
-党支部数量：{{dwxx.DZBSL}}
-其中运输站段：{{dwxx.DZBSL_YSZD}}
-占比：{{((dwxx.DZBSL/dwxx.DZZZS)|number:3)*100}}%
-<br>
-<br>
-党员总数：{{dyxx.DYSL}}
-<br>
-停职党员数：{{dyxx.TZDYS}} 离退休：{{dyxx.LTX}} 其他：{{dyxx.QT}}
-<br>
-正式党员：{{dyxx.ZSDY}} 预备党员：{{dyxx.YBDY}} 在职党员：{{dyxx.ZZDY}}
-<br>
-入党申请人数：{{dyxx.RDSQRS}} 入党积极分子：{{dyxx.RDJJFZ}} 发展对象：{{dyxx.FZDX}}
-<div ng-if="id==1">
-    <img src="../../../../content/images/dsj1.png" style="width: 100%;"/>
-</div>
-<div ng-if="id==2">
-    <img src="../../../../content/images/dsj2.png" style="width: 100%;"/>
-</div>
-<div ng-if="id==3">
-    <img src="../../../../content/images/dsj3.png" style="width: 100%;"/>
-</div>
-<div ng-if="id==4">
-    <img src="../../../../content/images/dsj4.png" style="width: 100%;"/>
-</div>
--->
+<page-resizes></page-resizes>

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

@@ -41,43 +41,6 @@
         };
         $scope.load_dwxx();
 
-        //党组织信息
-        $scope.province = ['', '119', '118', '121'];
-        $scope.dzz_total = {};
-        $scope.dzz_GuangDong = {};
-        $scope.dzz_HuNan = {};
-        $scope.dzz_HaiNan = {};
-        $scope.load_dzzcount = function (province) {
-            $http
-            ({
-                method: 'get',
-                url: '../../api/bigdata/getDzzxxCount',
-                params: {
-                    province: province
-                }
-            }).then(function (result) {
-                if (result.data != null) {
-                    var data = result.data;
-                    switch (province) {
-                        case '':
-                            $scope.dzz_total = data;
-                            break;
-                        case '119':
-                            $scope.dzz_GuangDong = data;
-                            break;
-                        case '118':
-                            $scope.dzz_HuNan = data;
-                            break;
-                        case '121':
-                            $scope.dzz_HaiNan = data;
-                            break;
-                    }
-                }
-            });
-        };
-        angular.forEach($scope.province, function (val) {
-            $scope.load_dzzcount(val);
-        });
 
         //党员信息
         $scope.dyxx = {};
@@ -135,6 +98,115 @@
 
         //图标取数begin
         {
+            //评先评优
+            $scope.dyTotal_x_dataList = [];
+            $scope.dyTotal_y_dataList = [
+                {
+                    name: '党员数量',
+                    type: 'bar',
+                    data: [],
+                    color: '#5186f8'
+                },
+                {
+                    name: '发展党员数量',
+                    type: 'bar',
+                    data: [],
+                    color: '#fff'
+                }
+            ];
+            $scope.dyTotal_legend = ['党员数量', '发展党员数量'];
+            $scope.dyTotal_barOption = {
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    }
+                },
+                legend: {
+                    x: 'center',
+                    y: 'bottom',
+                    data: $scope.dyTotal_legend,
+                    icon: "circle",
+                    textStyle: {
+                        color: '#fff'
+                    }
+                },
+                xAxis: {
+                    type: "category",
+                    data: $scope.dyTotal_x_dataList,
+                    axisLabel: {
+                        color: '#fff',
+                        rotate:45
+                    }
+                },
+                yAxis: {
+                    type: "value",
+                    axisLabel: {
+                        color: '#fff'
+                    },
+                    axisTick: {       //y轴刻度线
+                        show: false
+                    },
+                    splitLine: {     //网格线
+                        show: false
+                    },
+                    splitNumber: 1
+                },
+                series: $scope.dyTotal_y_dataList,
+                grid: {
+                    top: 20,
+                    bottom: 25,
+                    containLabel: true
+                }
+            };
+            $scope.load_dyTotal = function () {
+                $http
+                ({
+                    method: 'get',
+                    url: '../../api/bigdata/getPartyUserStatusTotalList',
+                    params: {}
+                }).then(function (result) {
+                    if (result.data != null && result.data.length > 0) {
+                        var userStatusTotalList = result.data.filter(e => e.partyType === '400');
+                        var partyList = [];
+                        angular.forEach(result.data.filter(e => e.partyType === '400'), function (val) {
+                            if (partyList.filter(p => p.partyCode === val.partyCode).length == 0) {
+                                partyList.push({partyCode: val.partyCode, partyName: val.partyName});
+                            }
+                        });
+
+                        angular.forEach(partyList, function (val) {
+                            $scope.dyTotal_x_dataList.push(val.partyName);
+                            var partyUserTotalList = userStatusTotalList.filter(e => e.partyCode === val.partyCode);
+                            var count1 = 0; //党员数量
+                            var count2 = 0; //发展党员数量
+                            partyUserTotalList.forEach(e => {
+                                switch (e.userStatus) {
+                                    case '1':
+                                        count2 += e.userCount;
+                                        break;
+                                    case '2':
+                                        count1 += e.userCount;
+                                        break;
+                                    case '3':
+                                        count1 += e.userCount;
+                                        break;
+                                    case '5':
+                                        count2 += e.userCount;
+                                        break;
+                                    case '6':
+                                        count2 += e.userCount;
+                                        break;
+                                }
+                            });
+                            $scope.dyTotal_y_dataList[0].data.push(count1);
+                            $scope.dyTotal_y_dataList[1].data.push(count2);
+                        });
+                    }
+                });
+            };
+            $scope.load_dyTotal();
+
             //党组织分布情况
             $scope.dzzfbqk_dataList = [];
             $scope.dzzfbqk_nameList = [];
@@ -190,8 +262,8 @@
                         formatter: '{value}',
                         color: '#fff'
                     },
-                    axisTick:{       //y轴刻度线
-                        show:false
+                    axisTick: {       //y轴刻度线
+                        show: false
                     },
                     splitLine: {     //网格线
                         show: false
@@ -244,28 +316,92 @@
             };
             $scope.load_dzzfbqk();
 
-            //年度考评结果
+            //发展党员情况
+            $scope.fzdyqk_dataList = [];
+            $scope.fzdyqk_nameList = ["预备党员", "入党申请人数", "入党积极分子", "发展对象"];
+            $scope.fzdyqk_barOption = {
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {            // 坐标轴指示器，坐标轴触发有效
+                        type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
+                    },
+                    formatter: "{a} <br/>{b} : {c}"
+                },
+                xAxis: {
+                    type: 'value',
+                    name: '数量',
+                    axisLabel: {
+                        formatter: '{value}',
+                        color: '#fff'
+                    },
+                    axisTick: {       //y轴刻度线
+                        show: false
+                    },
+                    splitLine: {     //网格线
+                        show: false
+                    }
+                },
+                yAxis: {
+                    type: 'category',
+                    inverse: true,
+                    axisLabel: {
+                        color: '#fff'
+                    },
+                    data: $scope.fzdyqk_nameList
+                },
+                series: [
+                    {
+                        name: '发展党员情况',
+                        data: $scope.fzdyqk_dataList,
+                        type: "bar",
+                        barWidth: 20,
+                        itemStyle: {
+                            normal: {
+                                color: function (params) {
+                                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE'];
+                                    return colorList[params.dataIndex];
+                                }
+                            }
+                        }
+                    }
+                ],
+                grid: {
+                    top: 20,
+                    bottom: 10,
+                    containLabel: true
+                }
+            };
 
-            $scope.ndkpjg_dataList = [];
-            $scope.ndkpjg_nameList = [];
-            $scope.ndkpjg_pieOption = {
+            //党员性别
+            $scope.dyxb_dataList = [];
+            $scope.dyxb_pieOption = {
                 legend: {
-                    bottom: 0,
-                    left: 'center',
-                    data: $scope.ndkpjg_nameList,
+                    type: 'scroll',
+                    orient: 'vertical',
+                    right: 0,
+                    bottom: 5,
+                    data: $scope.xueli_legend_data,
+                    top: '10%',
                     icon: "circle",
                     textStyle: {
                         color: '#fff'
+                    },
+                    formatter: function (name) {
+                        var target = 0;
+                        angular.forEach($scope.dyxb_dataList, function (item, index) {
+                            if (item.name == name) {
+                                target = item.value;
+                            }
+                        });
+                        return name + '：' + target;
                     }
                 },
-                tooltip: {
-                    trigger: 'item',
-                    formatter: "{a} <br/>{b} : {c} ({d}%)"
-                },
                 series: [
+
                     {
-                        name: '基层单位党组织年度考评结果',
+                        name: '党员性别',
                         type: 'pie',
+                        radius: ['50%', '80%'],
                         avoidLabelOverlap: false,
                         label: {
                             normal: {
@@ -285,214 +421,124 @@
                                 show: false
                             }
                         },
-                        data: $scope.ndkpjg_dataList
+                        data: $scope.dyxb_dataList,
+                        center: ['30%', '50%']
                     }
-                ]
-            };
-
-            $scope.load_ndkpjg = function () {
-                $scope.ndkpjg_dataList.length = 0;
-                $http
-                ({
-                    method: 'get',
-                    url: '../../api/bigdata/getDjkpxxTotalList',
-                    params: {
-                        year: $scope.selectparam.ndkpjg_nd
-                    }
-                }).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.ndkpjg_dataList.push($scope.getPieData(item.COUNT, item.NAME, colorList[index < colorList.length ? index : (colorList.length - 1)]));
-                            $scope.ndkpjg_nameList.push(item.NAME);
-                        });
-                    }
-                });
-            };
-            $scope.load_ndkpjg();
-            $scope.$watch('selectparam.ndkpjg_nd', function (newValue, oldValue) {
-                if (newValue != '' && newValue != null && newValue != oldValue) {
-                    $scope.load_ndkpjg();
-                }
-            });
-
-
-            //党员动态
-            $scope.nydt_x_dataList = [];
-            $scope.nydt_y_dataList = [
-                {
-                    name: '转入党员人数',
-                    type: 'line',
-                    stack: '总量',
-                    data: [],
-                    color: '#F8B551'
-                },
-                {
-                    name: '转出党员人数',
-                    type: 'line',
-                    stack: '总量',
-                    data: [],
-                    color: '#918879'
-                },
-                {
-                    name: '内部接转人数',
-                    type: 'line',
-                    stack: '总量',
-                    data: [],
-                    color: '#EFF0C7'
-                }
-            ];
-            $scope.nydt_nameList = [];
-            $scope.nydt_lineOption = {
-                title: {
-                    text: ''
-                },
+                ],
                 tooltip: {
-                    trigger: 'axis'
-                },
-                legend: {
-                    x: 'center',
-                    y: 'bottom',
-                    data: ['转入党员人数', '转出党员人数', '内部接转人数'],
-                    textStyle: {
-                        color: '#fff'
-                    }
-                },
-                /*grid: {
-                    left: '3%',
-                    right: '4%',
-                    bottom: '3%',
-                    containLabel: true
-                },
-                toolbox: {
-                    feature: {
-                        saveAsImage: {}
-                    }
-                },*/
-                xAxis: {
-                    type: 'category',
-                    boundaryGap: false,
-                    axisLabel: {
-                        color: '#fff'
-                    },
-                    data: $scope.nydt_x_dataList
-                },
-                yAxis: {
-                    type: 'value',
-                    axisLabel: {
-                        color: '#EFF0C7'
-                    },
-                    axisTick:{       //y轴刻度线
-                        show:false
-                    },
-                    splitLine: {     //网格线
-                        show: false
+                    trigger: 'item',
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
-                },
-                series: $scope.nydt_y_dataList,
-                grid: {
-                    top: 20,
-                    bottom: 25,
-                    containLabel: true
                 }
             };
-            $scope.load_nydt = function () {
+            $scope.load_dyxb = function () {
+                $scope.dyxb_dataList.length = 0;
                 $http
                 ({
                     method: 'get',
-                    url: '../../api/bigdata/getDsjDydtList',
+                    url: '../../api/bigdata/getDyxbCount',
                     params: {
-                        nd_OrderBy: 1
+                        /*dzzdm: $scope.selectparams.selectdzzdm,
+                        isOnduty: $scope.selectparams.navSelected*/
                     }
                 }).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);
+                        var colors = ['#F8B551', '#918879'];
+                        angular.forEach(result.data, function (val, index) {
+                            $scope.dyxb_dataList.push($scope.getPieData(val.NUM, val.SEXNAME, colors[index]));
                         });
                     }
                 });
             };
-            $scope.load_nydt();
+            $scope.load_dyxb();
 
-            //发展党员情况
-            $scope.fzdyqk_dataList = [];
-            $scope.fzdyqk_nameList = ["预备党员", "入党申请人数", "入党积极分子", "发展对象"];
-            $scope.fzdyqk_barOption = {
-                tooltip: {
-                    trigger: 'axis',
-                    axisPointer: {            // 坐标轴指示器，坐标轴触发有效
-                        type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                    },
-                    formatter: "{a} <br/>{b} : {c}"
-                },
-                xAxis: {
-                    type: 'value',
-                    name: '数量',
-                    axisLabel: {
-                        formatter: '{value}',
+            //三会一课
+            $scope.shyk_dataList = [];
+            $scope.shyk_pieOption = {
+                legend: {
+                    type: 'scroll',
+                    orient: 'vertical',
+                    right: 0,
+                    bottom: 5,
+                    /*data: $scope.xueli_legend_data,*/
+                    top: '10%',
+                    icon: "circle",
+                    textStyle: {
                         color: '#fff'
                     },
-                    axisTick:{       //y轴刻度线
-                        show:false
-                    },
-                    splitLine: {     //网格线
-                        show: false
+                    formatter: function (name) {
+                        var target = 0;
+                        angular.forEach($scope.shyk_dataList, function (item, index) {
+                            if (item.name == name) {
+                                target = item.value;
+                            }
+                        });
+                        return name + '：' + target;
                     }
                 },
-                yAxis: {
-                    type: 'category',
-                    inverse: true,
-                    axisLabel: {
-                        color: '#fff'
-                    },
-                    data: $scope.fzdyqk_nameList
-                },
                 series: [
+
                     {
-                        name: '发展党员情况',
-                        data: $scope.fzdyqk_dataList,
-                        type: "bar",
-                        barWidth: 20,
-                        itemStyle: {
+                        name: '三会一课类型',
+                        type: 'pie',
+                        /*radius: ['50%', '80%'],*/
+                        avoidLabelOverlap: false,
+                        label: {
                             normal: {
-                                color: function (params) {
-                                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE'];
-                                    return colorList[params.dataIndex];
+                                show: false,
+                                position: 'center'
+                            },
+                            emphasis: {
+                                show: true,
+                                textStyle: {
+                                    fontSize: '20',
+                                    fontWeight: 'bold'
                                 }
                             }
-                        }
+                        },
+                        labelLine: {
+                            normal: {
+                                show: false
+                            }
+                        },
+                        data: $scope.shyk_dataList,
+                        center: ['30%', '50%']
                     }
                 ],
-                grid: {
-                    top: 20,
-                    bottom: 10,
-                    containLabel: true
+                tooltip: {
+                    trigger: 'item',
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
+                    }
                 }
             };
-            $scope.load_fzdyqk = function () {
+            $scope.load_shyk = function () {
+                $scope.shyk_dataList.length = 0;
                 $http
                 ({
                     method: 'get',
-                    url: '../../api/bigdata/getDsjFzdyqkList',
-                    params: {}
+                    url: '../../api/bigdata/getShykCount',
+                    params: {
+                        dzzdm: ''
+                    }
                 }).then(function (result) {
-                    if (result.data != null && result.data.length > 0) {
-                        angular.forEach(result.data, function (val) {
-                            $scope.fzdyqk_nameList.push(val.lbmc);
-                            $scope.fzdyqk_dataList.push(val.sl);
+                    if (result.data != null && result.data.item.length > 0) {
+                        var colors = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE'];
+                        angular.forEach(result.data.item.filter(e => e.SHYKTYPE <= 4), function (val, index) {
+                            $scope.shyk_dataList.push($scope.getPieData(val.NUM, val.SHYKTYPENAME, colors[index]));
                         });
                     }
                 });
             };
-            //$scope.load_fzdyqk();
+            $scope.load_shyk();
 
             //组织饼图数据
             $scope.getPieData = function (val, name, color) {
                 return {value: val, name: name, itemStyle: {color: color}};
             };
+
+
         }
         //图标取数end
     });

src/main/resources/static/app/main/partyTwoExt/mzpyxx/list.html

@@ -44,7 +44,7 @@
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <input name="xm" class="form-control" type="text"
+                                                <input name="username" class="form-control" type="text"
                                                        ng-keypress="($event.which === 13)?search():0"
                                                        ng-model="selectparams.username"
                                                        placeholder=""/>
@@ -109,8 +109,9 @@
                         <div class="search-btn" style="margin-right: 20px;">
                             <div style="min-width: 13em">
                                 <span class="moreSpan" ng-click="isShowClick()"
-                                      style='padding-right:1em;cursor:pointer;'>{{moreTxt}}<i class="material-icons"
-                                                                                              style="position: relative;top:7px;">{{isShow ? 'expand_less' : 'expand_more'}}</i></span>
+                                      style='padding-right:1em;cursor:pointer;'>{{moreTxt}}
+                                    <i class="material-icons" style="position: relative;top:7px;">{{isShow ? 'expand_less' : 'expand_more'}}</i>
+                                </span>
                                 <button class="btn btn-default1"
                                         ng-click="search()">查询
                                 </button>

src/main/resources/static/app/main/partyTwoExt/mzpyxx/list.js

@@ -194,6 +194,7 @@
             $scope.selectparams.pyjg = $scope.resetparams.pyjg;
             $scope.selectparams.beginTime = $scope.resetparams.beginTime;
             $scope.selectparams.endTime = $scope.resetparams.endTime;
+            $scope.loadData();
         }
     });
 })(angular);

src/main/resources/static/app/main/partylife/meeting/list.html

@@ -72,6 +72,9 @@
                                 <button class="btn btn-default1"
                                         ng-click="search()">查询
                                 </button>
+                                <button class="btn btn-default1"
+                                        ng-click="reset()">重置
+                                </button>
                             </div>
                         </div>
                     </div>

src/main/resources/static/app/main/partylife/meeting/list.js

@@ -18,8 +18,9 @@
             isunfold: false,//组织结构树展开收缩
             selectdzzdm: "",
             selectdzzmc: "",
-            defaultselected: $state.params.dzzdm
+            defaultselected: ''
         };
+        $scope.resettreeparams = angular.copy($scope.treeparams);
         //查询条件
         $scope.selectparams = {
             pageindex: 1,
@@ -31,6 +32,7 @@
             endDate: null
         };
         $scope.pageInfo = {ptotal: 0};
+        $scope.resetselectparams = angular.copy($scope.selectparams);
 
         $scope.$on('tabChildReloadData', function (event, data) {
             if (data.name == 'pf_meetingListCtrl') {
@@ -166,5 +168,12 @@
         };
 
         $scope.loadData();
+
+        $scope.reset = function () {
+            $scope.treeparams = angular.copy($scope.resettreeparams);
+            $scope.selectparams = angular.copy($scope.resetselectparams);
+            $scope.selectparams.partyLifeMeetingType = $scope.partyLifeMeetingType;
+            $scope.loadData();
+        }
     });
 })(angular);