Merge remote-tracking branch 'origin/master'

lib/数据更新脚本.txt

@@ -351,3 +351,24 @@ INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `
 INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('f6ec1d5a-0004-47c0-bb7e-ce03f7eaf575', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1b7e571e-0001-4475-9e24-98636ba0bd76', NULL, 3, 'home.pxTrainingClassDetail', '查看培训班信息', NULL, NULL, NULL, 0, 0, NULL);
 INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('f6ec1d5a-0004-47c0-bb7e-ce03f7eaf575', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1b7e571e-0001-4475-9e24-98636ba0bd76', NULL, 3, 'home.pxTrainingClassCourseList', '授课课程', NULL, NULL, NULL, 0, 0, NULL);
 
+-- 2024.7.30 党内职务视图更新
+create or replace view vw_partyduty as
+  SELECT
+        `t`.`rybm` AS `RYBM`,
+        GROUP_CONCAT(`t`.`zwmc`
+            SEPARATOR ',') AS `DNZW`,
+        MAX(`t`.`PZRZRQ`) AS `PZRZRQ`
+    FROM
+        (SELECT
+            `b`.`RYBM` AS `rybm`,
+                `zwmc`.`HZMC` AS `zwmc`,
+                `b`.`PZRZRQ` AS `PZRZRQ`
+        FROM
+            ((`zz_bzcyxx` `b`
+        JOIN `zz_zzqkxxfb` `t1` ON (((`b`.`DZZDM` = `t1`.`DZZDM`)
+            AND (`b`.`JC` = `t1`.`LDJTJC`))))
+        JOIN `zzzd_zwmc` `zwmc` ON ((`b`.`ZWMC` = `zwmc`.`BM`)))
+        WHERE
+            (`b`.`PZMZRQ` IS NULL or `b`.`PZMZRQ`='')) `t`
+    GROUP BY `t`.`rybm`
+

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

@@ -66,7 +66,7 @@ public class AppController {
 
     @GetMapping("web")
     public String Web() {
-        return "redirect:/mobile/index.html";
+        return "redirect:/app/main/index.html";
     }
 
     @GetMapping("mobile")

src/main/resources/mapping/BigDataCQuery.xml

@@ -265,46 +265,20 @@
 
     <!--统计政工职务党员数量-->
     <select id="selectZgzwCount" resultType="java.util.HashMap">
-        select t1.ZGSTYPE
-        ,(case t1.ZGSTYPE
-        when 1 then '高级政工师'
-        when 2 then '政工师'
-        when 3 then '助理政工师'
-        when 4 then '政工员'
-        else '' end) ZGSNAME
-        ,ifnull(t2.num,0) NUM
-        from (select dic.DICKEY as ZGSTYPE from cf_dictionary dic where dic.DICTYPEKEY='monthType' and dic.DICKEY <![CDATA[ <= ]]> 4) t1
-        left join (select zgsType,count(*) num from (
-        select distinct ryjbxxbs,szdzbdm,us.XJSZWMC,xjszw.HZMC,
-        (case when xjszw.HZMC ='高级政工师' then 1
-        when xjszw.HZMC ='政工师' then 2
-        when xjszw.HZMC ='助理政工师' then 3
-        when xjszw.HZMC ='政工员' then 4
-        else 5 end) zgsType
-        from VM_RYJBXX us
-        inner join ZZ_ZZQKXX zz on us.SZDZBDM = zz.DZZDM
-        left join zd_zyjszwdm xjszw on us.XJSZWMC = xjszw.BM
-        where 1=1
+        select zw.bm as code,zw.hzmc as name
+        ,sum(case when uszw.rybm is not null then 1 else 0 end) as count from Zzzd_Zwmc zw
+        left join (
+        select b.rybm,b.ZWMC from zz_bzcyxx b
+        inner join zz_zzqkxxfb fb on b.DZZDM = fb.DZZDM and b.jc = fb.LDJTJC
+        inner join zz_zzqkxx p on fb.DZZDM = p.DZZDM
+        inner join vm_ryjbxx us on b.rybm = us.RYBM
+        where (b.PZMZRQ is null or b.PZMZRQ='')
         <if test="dzzdm != null and dzzdm != ''">
             and us.SZDZBDM like concat('',#{dzzdm},'%')
         </if>
-        <if test="dwgzzlb !=null">
-            <if test="dwgzzlb == 1">
-                and us.ZWMC like '%党委书记%'
-            </if>
-            <if test="dwgzzlb == 2">
-                and us.ZWMC like '%党委副书记%'
-            </if>
-            <if test="dwgzzlb == 3">
-                and (us.ZWMC like '%支部书记%' or us.ZWMC like '%总支书记%')
-            </if>
-            <if test="dwgzzlb == 4">
-                and (us.ZWMC like '%支部副书记%' or us.ZWMC like '%总支副书记%')
-            </if>
-        </if>
-        ) tt1 group by ZGSTYPE
-        ) t2 on t1.ZGSTYPE=t2.ZGSTYPE
-        order by t1.ZGSTYPE
+        ) uszw on zw.bm = uszw.ZWMC
+        group by zw.bm,zw.hzmc
+        order by zw.xh
     </select>
 
     <select id="CountRYZT" resultType="java.util.Map">

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

@@ -250,7 +250,10 @@
 
 .right-container{ display: flex; flex-direction: row; flex-wrap: wrap; justify-content: space-between;}
 .rc-1{ height: 100%; align-content: center;}
-.b-5{ width:32%; margin: 15px 5px; overflow: hidden;height: 43%;}
+.b-5{ width:32%; margin: 13px 5px; overflow: hidden;height: 47%;}
+.b-5-top{
+	margin-top: 30px;
+}
 .b-all{ flex-grow:3;}
 .b-all-2{ flex-grow:2; margin-right: 20px;}
 .text-all{ position: absolute; top:26px; left: 150px;}

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

@@ -27,27 +27,27 @@
 
 <!-- 右内容区 -->
 <div class="right-content boxheight">
-    <div class="right-nav">
+    <!--<div class="right-nav">
         <div class="rn" ng-class="{active:nav.id==selectparams.navSelected}" ng-repeat="nav in selectparams.navs" ng-click="navClick(nav.id)">{{nav.text}}</div>
-    </div>
+    </div>-->
     <div class="right-container rc-1">
-        <div class="box b-5">
+        <div class="box b-5 b-5-top">
             <h1>性别情况</h1>
             <!-- 图表容器 -->
             <div e-chart ec-data="dyxb_pieOption" class="charts4"></div>
         </div>
-        <div class="box b-5">
+        <div class="box b-5 b-5-top">
             <h1>学历情况</h1>
             <!-- 图表容器 -->
             <div e-chart ec-data="pieOption_xueli" class="charts4"></div>
         </div>
-        <div class="box b-5">
+        <div class="box b-5 b-5-top">
             <h1>年龄分布情况</h1>
             <!-- 图表容器 -->
             <div e-chart ec-data="dynl_pieOption" class="charts4"></div>
         </div>
         <div class="box b-5 b-all-2">
-            <h1>政工职务人数</h1>
+            <h1>党内职务人数</h1>
             <!-- 图表容器 -->
             <div e-chart ec-data="zgzw_barOption" class="charts4"></div>
         </div>

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

@@ -58,8 +58,8 @@
             $scope.dyxb_pieOption = {
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 },
                 legend: {
@@ -124,6 +124,7 @@
                         dwgzzlb: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dyxb_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dyxb_dataList.push($scope.getPieData(val.NUM, val.SEXNAME, $scope.selectparams.colors[index]));
@@ -137,8 +138,8 @@
             $scope.dynl_pieOption = {
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 },
                 legend: {
@@ -203,6 +204,7 @@
                         dwgzzlb: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dynl_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dynl_dataList.push($scope.getPieData(val.NUM, val.AGENAME, $scope.selectparams.colors[index]));
@@ -216,11 +218,11 @@
             $scope.dydl_pieOption = {
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 }
-                ,legend: {
+                , legend: {
                     type: 'scroll',
                     orient: 'vertical',
                     right: 0,
@@ -282,6 +284,7 @@
                         dwgzzlb: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dydl_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dydl_dataList.push($scope.getPieData(val.NUM, val.AGENAME, $scope.selectparams.colors[index]));
@@ -290,7 +293,7 @@
                 });
             };
 
-            //政工职务人数
+            //党内职务人数
             $scope.zgzw_dataList = [];
             $scope.zgzw_nameList = [];
             $scope.zgzw_barOption = {
@@ -314,12 +317,13 @@
                     axisLabel: {
                         color: '#fff'
                     },
-                    axisTick:{       //y轴刻度线
-                        show:false
+                    axisTick: {       //y轴刻度线
+                        show: false
                     },
                     splitLine: {     //网格线
                         show: false
-                    }
+                    },
+                    splitNumber: 1
                 },
                 series: [
                     {
@@ -342,14 +346,15 @@
                     method: 'get',
                     url: '../../api/bigdata/getZgzwCount',
                     params: {
-                        dzzdm: $scope.selectparams.selectdzzdm,
-                        dwgzzlb: $scope.selectparams.navSelected
+                        dzzdm: $scope.selectparams.selectdzzdm
                     }
                 }).then(function (result) {
+                    $scope.zgzw_nameList.length = 0;
+                    $scope.zgzw_dataList.length = 0;
                     if (result.data != null) {
                         angular.forEach(result.data, function (val, index) {
-                            $scope.zgzw_nameList.push(val.ZGSNAME);
-                            $scope.zgzw_dataList.push(val.NUM);
+                            $scope.zgzw_nameList.push(val.name);
+                            $scope.zgzw_dataList.push(val.count);
                         });
                     }
                 });
@@ -421,6 +426,8 @@
                         dwgzzlb: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.xueli_legend_data.length = 0;
+                    $scope.xueli_data.length = 0;
                     if (result.data.item != null) {
                         angular.forEach(result.data.item, function (val, index) {
                             $scope.xueli_legend_data.push(val.EDUCATIONNAME);

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

@@ -119,6 +119,7 @@
                         isOnduty: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dyxb_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         var colors = ['#F8B551', '#918879'];
                         angular.forEach(result.data, function (val, index) {
@@ -198,6 +199,7 @@
                         isOnduty: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dynl_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dynl_dataList.push($scope.getPieData(val.NUM, val.AGENAME, $scope.selectparams.colors[index]));
@@ -278,6 +280,7 @@
                         isOnduty: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dydl_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dydl_dataList.push($scope.getPieData(val.NUM, val.AGENAME, $scope.selectparams.colors[index]));
@@ -433,6 +436,8 @@
                         isOnduty: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.xueli_legend_data.length = 0;
+                    $scope.xueli_data.length = 0;
                     if (result.data.item != null) {
                         angular.forEach(result.data.item, function (val, index) {
                             $scope.xueli_legend_data.push(val.EDUCATIONNAME);
@@ -517,6 +522,8 @@
                     if (result.data.item.list.length > 0) {
                         var data = result.data.item.list[0];
                         $scope.fzdyqk_dataList.length = 0;
+                        $scope.dyzsrate_dataList.length = 0;
+
                         $scope.fzdyqk_dataList.push(data.YBDY);
                         $scope.fzdyqk_dataList.push(data.SQRD);
                         $scope.fzdyqk_dataList.push(data.JJFZ);

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

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