Merge remote-tracking branch 'origin/master'

lib/数据更新脚本.txt

@@ -1,202 +1,12 @@
---2024.6.26 党政联席会、民主集中制
-
-alter table pf_partylifemeeting add compere varchar(36) NULL COMMENT '主持人';
-alter table pf_partylifemeeting add personnel varchar(500) NULL COMMENT '列会人员';
-alter table pf_partylifemeeting add result varchar(1000) NULL COMMENT '会议主要议程及结果';
-
-CREATE TABLE `pf_partylifemeeting_personnel`  (
-  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
-  `partyLifeMeetingId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '会议id',
-  `rybm` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '人员编码',
-  `isAbsenteeism` int NULL DEFAULT NULL COMMENT '是否缺勤 0-缺勤；1-出勤',
-  `absenteeismCause` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '缺勤原因',
-  `createTime` datetime NULL DEFAULT NULL,
-  `createUserId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `updateTime` datetime NULL DEFAULT NULL,
-  `updateUserId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;
-
-INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('23f5e615-b16a-11ec-829d-7085c2a00001', 4, '党政联席会', 'PartyLifeMeetingType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
-INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('23f5e615-b16a-11ec-829d-7085c2a00002', 5, '民主集中制', 'PartyLifeMeetingType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
-
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('4806821b-b18e-11ec-829d-7085c2a9999e', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'c4516fca-2dd8-4373-9be8-1df510c8e5e1', NULL, 18, 'home.pf_meetingList4', '党政联席会', NULL, NULL, NULL, 1, 0, NULL);
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900001', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a9999e', NULL, 1, 'home.pf_meetingEdit4', '编辑党政联席会', NULL, NULL, NULL, 0, 0, NULL);
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900002', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a9999e', NULL, 2, 'home.pf_meetingAdd4', '新增党政联席会', NULL, NULL, NULL, 0, 0, NULL);
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900003', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a9999e', NULL, 3, 'home.pf_meetingDetail4', '查看党政联席会详情', NULL, NULL, NULL, 0, 0, NULL);
-
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('4806821b-b18e-11ec-829d-7085c2a99990', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'c4516fca-2dd8-4373-9be8-1df510c8e5e1', NULL, 1, 'home.pf_meetingList5', '民主集中制', NULL, NULL, NULL, 1, 0, NULL);
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900011', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a99990', NULL, 1, 'home.pf_meetingEdit5', '编辑民主集中制', NULL, NULL, NULL, 0, 0, NULL);
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900022', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a99990', NULL, 2, 'home.pf_meetingAdd5', '新增民主集中制', NULL, NULL, NULL, 0, 0, NULL);
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900033', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a99990', NULL, 3, 'home.pf_meetingDetail5', '查看民主集中制详情', NULL, NULL, NULL, 0, 0, NULL);
-
-
-CREATE TABLE `pf_partylifemeeting_scyd`  (
-  `partyLifeMeetingId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '会议id',
-  `scydType` int NOT NULL COMMENT '“三重一大”类别  1-重大事项决策、2-重要干部任免、3-重大项目投资决策、4-大额资金使用',
-  PRIMARY KEY (`partyLifeMeetingId`,`scydType`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
-
-INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('23f5e615-b16a-11ec-829d-7085c2a00003', 6, '“三重一大”制度', 'PartyLifeMeetingType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
-
-INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('23f5e615-b16a-11ec-0001-7085c2a00003', 1, '重大事项决策', 'scydType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
-INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('23f5e615-b16a-11ec-0002-7085c2a00003', 2, '重要干部任免', 'scydType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
-INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('23f5e615-b16a-11ec-0003-7085c2a00003', 3, '重大项目投资决策', 'scydType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
-INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('23f5e615-b16a-11ec-0004-7085c2a00003', 4, '大额资金使用', 'scydType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
-
-
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('4806821b-b18e-11ec-829d-7085c2a99991', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'c4516fca-2dd8-4373-9be8-1df510c8e5e1', NULL, 2, 'home.pf_scydMeetingList', '“三重一大”制度', NULL, NULL, NULL, 1, 0, NULL);
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900111', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a99991', NULL, 1, 'home.pf_scydMeetingEdit', '编辑“三重一大”制度', NULL, NULL, NULL, 0, 0, NULL);
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900122', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a99991', NULL, 2, 'home.pf_scydMeetingAdd', '新增“三重一大”制度', NULL, NULL, NULL, 0, 0, NULL);
-INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900133', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a99991', NULL, 3, 'home.pf_scydMeetingDetail', '查看“三重一大”制度详情', NULL, NULL, NULL, 0, 0, NULL);
-
-
----7.04 党建工作考核建表
-create table pt_checkData
-(
-    dataId               varchar(36) not null comment '唯一标识',
-    dzzdm                varchar(300) comment '组织代码',
-    year                 int comment '考核资料文件标识',
-    remark               varchar(300) comment '备注',
-    leadingDepartment    varchar(200) comment '考核资料是否上传',
-    checkDataUserId      varchar(36) comment '考核资料上传人',
-    checkDataUserName    varchar(36) comment '考核资料上传人姓名',
-    recordStatus         int comment '状态',
-    createTime           datetime comment '创建时间',
-    createUserId         varchar(36) comment '创建人id',
-    createUserName       varchar(300) comment '创建人姓名',
-    updateTime           datetime comment '修改时间',
-    updateUserId         varchar(36) comment '修改人id',
-    updateUserName       varchar(300) comment '修改人姓名',
-    primary key (dataId)
-);
-
-alter table pt_checkData comment '考核材料';
-
-create table pt_checkNameList
-(
-    nameId               varchar(36) not null comment '唯一标识',
-    dzzdm                varchar(300) comment '所在组织代码',
-    year                 int comment '年度',
-    quarter              int comment '季度',
-    checkUserId          varchar(36) comment '核查人',
-    checkUserName        varchar(36) comment '核查人姓名',
-    recordStatus         int comment '状态1、启用0、禁用',
-    createTime           datetime comment '创建时间',
-    createUserId         varchar(36) comment '创建人id',
-    createUserName       varchar(300) comment '创建人姓名',
-    primary key (nameId)
-);
-
-alter table pt_checkNameList comment '考核名单';
-
-create table pt_checkParty
-(
-    partyId              varchar(36) not null comment '唯一标识',
-    nameId               varchar(36) comment '关联名单',
-    partyCode            varchar(60) comment '支部代码',
-    partyName            varchar(200) comment '支部名称',
-    primary key (partyId)
-);
-
-alter table pt_checkParty comment '考核名单检查支部';
-
-alter table pt_checkParty add constraint FK_Reference_43 foreign key (nameId)
-    references pt_checkNameList (nameId) on delete restrict on update restrict;
-
-create table pt_checkScore
-(
-    scoreId              varchar(36) not null comment '唯一标识',
-    dzzdm                varchar(300) comment '组织代码',
-    year                 int comment '考核资料文件标识',
-    quarter              int comment '季度',
-    checkUserId          varchar(36) comment '核查人',
-    checkUserName        varchar(36) comment '核查人姓名',
-    score                decimal(8,2) comment '评分',
-    recordStatus         int comment '状态1、已评分0、未评分',
-    primary key (scoreId)
-);
-
-alter table pt_checkScore comment '考核评分';
-
-create table pt_checkQuestion
-(
-    questionId           varchar(36) not null comment '唯一标识',
-    scoreId              varchar(36) comment '关联评分',
-    questionName         varchar(260) comment '问题名称',
-    questionDesc         varchar(500) comment '问题描述',
-    primary key (questionId)
-);
-
-alter table pt_checkQuestion comment '考核问题';
-
-alter table pt_checkQuestion add constraint FK_Reference_42 foreign key (scoreId)
-    references pt_checkScore (scoreId) on delete restrict on update restrict;
-
-create table pt_reportData
-(
-    reportId             varchar(36) not null comment '唯一标识',
-    dzzdm                varchar(300) comment '组织代码',
-    year                 int comment '年度',
-    reportUserId         varchar(36) comment '述职人',
-    reportUserName       varchar(36) comment '述职人姓名',
-    recordStatus         int comment '状态1:已经上传0：未上传',
-    createTime           datetime comment '创建时间',
-    createUserId         varchar(36) comment '创建人id',
-    createUserName       varchar(300) comment '创建人姓名',
-    updateTime           datetime comment '修改时间',
-    updateUserId         varchar(36) comment '修改人id',
-    updateUserName       varchar(300) comment '修改人姓名',
-    primary key (reportId)
-);
-
-alter table pt_reportData comment '述职材料';
-
-
-create table pt_reportScore
-(
-    scoreId              varchar(36) not null comment '唯一标识',
-    reportId             varchar(36) comment '关联述职材料',
-    writtenScore         decimal(8,2) comment '书面述职评分',
-    sceneScore           decimal(8,2) comment '现场述职评分',
-    dailyScore           decimal(8,2) comment '日常党建工作考核评分',
-    total                decimal(8,2) comment '述职评分（总分）',
-    remark               varchar(360) comment '备注',
-    reportResult         int comment '评议结果',
-    createTime           datetime comment '创建时间',
-    createUserId         varchar(36) comment '创建人id',
-    createUserName       varchar(300) comment '创建人姓名',
-    updateTime           datetime comment '修改时间',
-    updateUserId         varchar(36) comment '修改人id',
-    updateUserName       varchar(300) comment '修改人姓名',
-    primary key (scoreId)
-);
-
-alter table pt_reportScore comment '述职评分';
-
-alter table pt_reportScore add constraint FK_Reference_44 foreign key (reportId)
-    references pt_reportData (reportId) on delete restrict on update restrict;
-
----7.04 党建工作考核管理菜单
 INSERT INTO CF_MENU (MENUID, APPLICATIONID, PARENTMENUID, MNUSYSTEM, MENUORDER, MENUNO, MENUNAME, MENUPROGRAM, MENUPIC, MENUDESC, ISVISIBLE, ISLEAF, ISBLANK)
-VALUES ('f237844c-2194-430f-bef7-ea68469c9f33', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'a2640551-3b11-484b-9420-4376641a760c', null, 8, 'workCheckMgr', '党建工作考核管理', null, null, '', 1, 0, null);
+VALUES ('9912122b-15d2-4e93-ac5e-06e4b091ee65', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', null, null, 20, '大数据分析', '大数据分析', null, 'trending_up', null, 1, 0, null);
 INSERT INTO CF_MENU (MENUID, APPLICATIONID, PARENTMENUID, MNUSYSTEM, MENUORDER, MENUNO, MENUNAME, MENUPROGRAM, MENUPIC, MENUDESC, ISVISIBLE, ISLEAF, ISBLANK)
-VALUES ('f237844c-4494-430f-bef7-ea68469c9f33', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'f237844c-2194-430f-bef7-ea68469c9f33', null, 1, 'home.checkNameList', '核查名单管理', null, null, '', 1, 0, null);
+VALUES ('9cbf8369-9b94-4baf-b75d-3e3bf045a4d1', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '9912122b-15d2-4e93-ac5e-06e4b091ee65', null, 10, 'home.bigdataList', '大数据维护', null, null, null, 1, 1, null);
 INSERT INTO CF_MENU (MENUID, APPLICATIONID, PARENTMENUID, MNUSYSTEM, MENUORDER, MENUNO, MENUNAME, MENUPROGRAM, MENUPIC, MENUDESC, ISVISIBLE, ISLEAF, ISBLANK)
-VALUES ('f237844c-5594-430f-bef7-ea68469c9f33', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'f237844c-2194-430f-bef7-ea68469c9f33', null, 2, 'home.checkData', '考核材料管理', null, null, '', 1, 0, null);
+VALUES ('432db382-6a35-4788-b6d8-2b0e85785f49', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '9912122b-15d2-4e93-ac5e-06e4b091ee65', null, 2, '../main/index-dsj.html#!/showDjdsj', '党建概况', null, null, null, 1, 1, 1);
 INSERT INTO CF_MENU (MENUID, APPLICATIONID, PARENTMENUID, MNUSYSTEM, MENUORDER, MENUNO, MENUNAME, MENUPROGRAM, MENUPIC, MENUDESC, ISVISIBLE, ISLEAF, ISBLANK)
-VALUES ('f237844c-6694-430f-bef7-ea68469c9f33', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'f237844c-2194-430f-bef7-ea68469c9f33', null, 3, 'home.checkScore', '考核评分管理', null, null, '', 1, 0, null);
-
+VALUES ('67ddad23-18a3-4336-b3ca-f148ff220589', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '9912122b-15d2-4e93-ac5e-06e4b091ee65', null, 4, '../main/index-dsj.html#!/showDjdsj_dwgzz', '党务工作者', null, null, null, 1, 1, 1);
 INSERT INTO CF_MENU (MENUID, APPLICATIONID, PARENTMENUID, MNUSYSTEM, MENUORDER, MENUNO, MENUNAME, MENUPROGRAM, MENUPIC, MENUDESC, ISVISIBLE, ISLEAF, ISBLANK)
-VALUES ('f237844c-2194-430f-bef7-ea68469c9f44', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'a2640551-3b11-484b-9420-4376641a760c', null, 9, 'reportScoreMgr', '述职评议管理', null, null, '', 1, 0, null);
+VALUES ('3c57eec8-fcb7-4cbd-a910-92633f2d8874', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '9912122b-15d2-4e93-ac5e-06e4b091ee65', null, 3, '../main/index-dsj.html#!/teams', '党员队伍', null, null, null, 1, 1, 1);
 INSERT INTO CF_MENU (MENUID, APPLICATIONID, PARENTMENUID, MNUSYSTEM, MENUORDER, MENUNO, MENUNAME, MENUPROGRAM, MENUPIC, MENUDESC, ISVISIBLE, ISLEAF, ISBLANK)
-VALUES ('1137844c-2194-430f-bef7-ea68469c9f33', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'f237844c-2194-430f-bef7-ea68469c9f44', null, 1, 'home.reportData', '上传述职材料', null, null, '', 1, 0, null);
-INSERT INTO CF_MENU (MENUID, APPLICATIONID, PARENTMENUID, MNUSYSTEM, MENUORDER, MENUNO, MENUNAME, MENUPROGRAM, MENUPIC, MENUDESC, ISVISIBLE, ISLEAF, ISBLANK)
-VALUES ('2237844c-2194-430f-bef7-ea68469c9f33', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'f237844c-2194-430f-bef7-ea68469c9f44', null, 2, 'home.reportScore', '上传述职材料', null, null, '', 1, 0, null);
+VALUES ('e1c6f537-cc54-4f39-939a-afb65ae7086b', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '9912122b-15d2-4e93-ac5e-06e4b091ee65', null, 5, '../main/index-dsj.html#!/showDjdsj_dwdt', '党务动态', null, null, null, 1, 1, 1);

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

@@ -40,7 +40,7 @@
         <div class="charts5">
             <div class="round-box">
                 <h1>{{shykDataTotal}}次<br><span>统计</span></h1>
-                <div ng-repeat="item in shykData" class="round r-{{$index+1}}">
+                <div ng-repeat="item in shykData" class="round r-{{$index+1}}" ng-if="$index<4">
                     <h2>{{item.SHYKTYPENAME}}</h2>
                     <span>{{shykDataTotal>0?((item.NUM/shykDataTotal)*100|number:2):0}}%</span>
                     <div class="s-number">{{item.NUM}}</div>

src/main/resources/static/app/main/home/mainindex.html

@@ -1,115 +1,4 @@
 <div class="main-f-index">
-    <!--快捷入口-->
-    <div class="main-link-div" ng-if="isShowMore">
-        <div class="card">
-            <div class="header">
-                <h2 class="demo-icon-container">
-                    <div class="text-center">
-                        <!--<i class="material-icons col-red">send</i>-->
-                        <span class="main-card-title">快捷入口</span>
-                    </div>
-                </h2>
-            </div>
-            <div class="body">
-                <!--<button type="button" class="btn btn-default" ng-click="testWxpay()">测试微信支付</button>-->
-                <ul class="main-link">
-                    <li role-permission-code="mainindex.shykDiv">
-                        <a href="javascript:void(0)" bs-ui-sref="home.shykList">
-                            <image ng-src="./images/shyk.svg"></image>
-                            <p>三会一课</p>
-                        </a>
-                    </li>
-                    <li role-permission-code="mainindex.cgjqDivv">
-                        <a href="javascript:void(0)" bs-ui-sref="home.cgjqScoreList">
-                            <image class="mainIndex_img" ng-src="./images/cgjq.svg"></image>
-                            <p>创岗建区</p>
-                        </a>
-                    </li>
-                    <li role-permission-code="mainindex.zxzxxDiv">
-                        <a href="javascript:void(0)" bs-ui-sref="home.programme"
-                        >
-                            <image ng-src="./images/zxzxx.svg"></image>
-                            <p style="margin: 10px">中心组学习</p>
-                        </a>
-                    </li>
-                    <li role-permission-code="mainindex.dyxxDiv">
-                        <a href="javascript:void(0)" bs-ui-sref="home.partyUserList"
-                        >
-                            <image ng-src="./images/dyxx.svg"></image>
-                            <p>党员信息</p>
-                        </a>
-                    </li>
-                    <li role-permission-code="mainindex.dyfzDiv">
-                        <a href="javascript:void(0)" bs-ui-sref="home.pe_UserList"
-                        >
-                            <image ng-src="./images/dyfz.svg"></image>
-                            <p>发展党员</p>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0)" ng-click="alertIsBuilding()"
-                        >
-                            <!--<image ng-src="./images/more.png"></image>-->
-                            <!--<p>更多</p>-->
-                        </a>
-                    </li>
-                </ul>
-                <!--
-                <div class="row clearfix" style="text-align: center">
-
-                    <div class="col-md-4" role-permission-code="mainindex.shykDiv">
-                        <a href="javascript:void(0)" bs-ui-sref="home.shykList"
-                           style="text-decoration: none;color: black">
-                            <image class="mainIndex_img" ng-src="./images/shyk.png"></image>
-                            <p style="margin: 10px">三会一课</p>
-                        </a>
-                    </div>
-
-                    <div class="col-md-4" role-permission-code="mainindex.cgjqDiv">
-                        <a href="javascript:void(0)" ng-click="alertIsBuilding()"
-                           style="text-decoration: none;color: black">
-                            <image class="mainIndex_img" ng-src="./images/cgjq.png"></image>
-                            <p style="margin: 10px">创岗建区</p>
-                        </a>
-                    </div>
-
-                    <div class="col-md-4" role-permission-code="mainindex.zxzxxDiv">
-                        <a href="javascript:void(0)" bs-ui-sref="home.programme"
-                           style="text-decoration: none;color: black">
-                            <image class="mainIndex_img" ng-src="./images/zxzxx.png"></image>
-                            <p style="margin: 10px">中心组学习</p>
-                        </a>
-                    </div>
-
-                    <div class="col-md-4" role-permission-code="mainindex.dyxxDiv">
-                        <a href="javascript:void(0)" bs-ui-sref="home.partyUserList"
-                           style="text-decoration: none;color: black">
-                            <image class="mainIndex_img" ng-src="./images/dyxx.png"></image>
-                            <p style="margin: 10px">党员信息</p>
-                        </a>
-                    </div>
-
-                    <div class="col-md-4" role-permission-code="mainindex.dyfzDiv">
-                        <a href="javascript:void(0)" ng-click="alertIsBuilding()"
-                           style="text-decoration: none;color: black">
-                            <image class="mainIndex_img" ng-src="./images/dyfz.png"></image>
-                            <p style="margin: 10px">发展党员</p>
-                        </a>
-                    </div>
-
-                    <div class="col-md-4">
-                        <a href="javascript:void(0)" ng-click="alertIsBuilding()"
-                           style="text-decoration: none;color: black">
-                            <image class="mainIndex_img" ng-src="./images/more.png"></image>
-                            <p style="margin: 10px">更多</p>
-                        </a>
-                    </div>
-
-                </div>-->
-
-            </div>
-        </div>
-    </div>
     <div class="main-f-left">
         <div class="main-f-first">
             <div class="main-schedule">
@@ -203,348 +92,30 @@
                         <h2 class="demo-icon-container">
                             <div class="demo-google-material-icon">
                                 <!--<i class="material-icons col-red">date_range</i>-->
-                                <span class="main-card-title">我的会议</span>
+                                <span class="main-card-title">工作提醒</span>
                             </div>
                         </h2>
-                        <!--<ul ng-if="dataScope==5 || dataScope==6 || dataScope==999"
-                            role-permission-code="mainindex.workWarning3" class="header-dropdown m-r&#45;&#45;5">
-                            <li class="dropdown demo-icon-container more">
-                                <a bs-ui-sref="home.shykList"
-                                   class="dropdown-toggle demo-google-material-icon">
-                                    <span class="icon-name">更多</span>
-                                    <i class="material-icons">keyboard_arrow_right</i>
-                                </a>
-                            </li>
-                        </ul>-->
-                        <!--<ul role-permission-code="mainindex.workWarning5" class="header-dropdown m-r&#45;&#45;5">-->
-                            <!--<li class="dropdown demo-icon-container main-card-more">-->
-                                <!--<a ng-click="worktag=(worktag+1)%2"-->
-                                   <!--class="dropdown-toggle demo-google-material-icon">-->
-                                    <!--<span class="icon-name">{{worktag==1?"发展党员":"返回"}}</span>-->
-                                    <!--<i class="material-icons">keyboard_arrow_right</i>-->
-                                <!--</a>-->
-                            <!--</li>-->
-                        <!--</ul>-->
                     </div>
                     <!--工作提醒-权限配置-->
-                    <div ng-if="dataScope==1 || dataScope==2 || dataScope==7" class="body"
-                         role-permission-code="mainindex.workWarning1"
+                    <div class="body"
                          style="padding-top: 0px;">
-                        <!--<div panel-title data-title="'领导人员落实组织生活“5+3”制度情况'"></div>-->
-                        <!--<div style="display: flex;">-->
-                            <!--<div class="leadwarning">-->
-                                <!--<table style="border-collapse: separate;border-spacing: 0em 0.4em">-->
-                                    <!--<tr ng-repeat="item in getLeaderData(1)">-->
-                                        <!--<th>-->
-                                            <!--<span>{{$index+1}}.{{item.leaderTypeName}}<spam ng-if="item.leaderType!=5">（{{item.totalTypeName}}）</spam></span>-->
-                                        <!--</th>-->
-                                        <!--<td>-->
-                                            <!--<span ng-if="item.leaderType!=5" class="leadwarning-number"-->
-                                                  <!--ng-class="item.count>=item.baseCount?'':'warning-label-bule'"-->
-                                                  <!--ng-click="showFSDetail(item)">{{item.count>=item.baseCount?'已完成':'未完成'}}</span>-->
-                                            <!--<span ng-if="item.leaderType==5" class="leadwarning-number" ng-click="showFSDetail(item)">{{item.count}}</span>-->
-                                            <!--<div class="leadwarning-bottomline"></div>-->
-                                        <!--</td>-->
-                                    <!--</tr>-->
-                                <!--</table>-->
-                            <!--</div>-->
-                            <!--<div class="leadwarning-add">-->
-                                <!--+-->
-                            <!--</div>-->
-                            <!--<div class="leadwarning">-->
-                                <!--<table style="border-collapse: separate;border-spacing: 0em 0.5em">-->
-                                    <!--<tr ng-repeat="item in getLeaderData(2)">-->
-                                        <!--<th>-->
-                                            <!--<span>{{$index+1}}.{{item.leaderTypeName}}（{{item.totalTypeName}}）</span>-->
-                                        <!--</th>-->
-                                        <!--<td>-->
-                                            <!--<span class="leadwarning-number"-->
-                                                  <!--ng-class="item.count>=item.baseCount?'':'warning-label-bule'"-->
-                                                  <!--ng-click="showFSDetail(item)">{{item.count>=item.baseCount?'已完成':'未完成'}}</span>-->
-                                            <!--<div class="leadwarning-bottomline"></div>-->
-                                        <!--</td>-->
-                                    <!--</tr>-->
-                                <!--</table>-->
-                            <!--</div>-->
-                        <!--</div>-->
-                        <!--<div panel-title data-title="'中心组学习情况'"></div>-->
-                        <!--<div style="background-color: #FAF7FB;border: 1px solid #ddd;display: flex;">
-                            <table style="width: 100%;">
-                                <tr>
-                                    <td style="padding: 3px;">
-                                        <table>
-                                            <tr>
-                                                <td style="padding: 3px;">
-                                                    <span>集中学习（1次/月）</span>
-                                                </td>
-                                                <td style="text-align: center;padding-right: 3px;color: #CA4F45;">
-                                                    <span style="cursor: pointer;" ng-click="showZxzxxqkDetail(1)">{{getZxzxxqkTotal(1)}}</span>
-                                                    <div style="height: 1px;width: 30px;background-color: #333;"></div>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <div style="width: 1em"></div>
-                                    </td>
-                                    <td style="padding: 3px;">
-                                        <table>
-                                            <tr>
-                                                <td style="padding: 3px;">
-                                                    <span>重点发言（1次/年）</span>
-                                                </td>
-                                                <td style="text-align: center;padding-right: 3px;color: #CA4F45;">
-                                                    <span style="cursor: pointer;" ng-click="showZxzxxqkDetail(1)">{{getZdfyNum()}}</span>
-                                                    <div style="height: 1px;width: 30px;background-color: #333;"></div>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>-->
-                        <!--<div class="leadwarning-zxzxx">-->
-                            <!--<div class="leadwarning-zxzxx-item">-->
-                                <!--<span>集中学习（1次/月）</span>-->
-                                <!--<div>-->
-                                    <!--<span class="leadwarning-zxzxx-item-number"-->
-                                          <!--ng-click="showZxzxxqkDetail(1)">{{getZxzxxqkTotal(1)}}</span>-->
-                                    <!--<div class="leadwarning-zxzxx-item-line"></div>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <!--<div class="leadwarning-zxzxx-item"-->
-                                 <!--style="padding-left: 15px;">-->
-                                <!--<span>重点发言（1次/年）</span>-->
-                                <!--<div>-->
-                                    <!--<span class="leadwarning-zxzxx-item-number"-->
-                                          <!--ng-click="showZxzxxqkDetail(1)">{{getZdfyNum(1)}}</span>-->
-                                    <!--<div class="leadwarning-zxzxx-item-line"></div>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                        <!--</div>-->
-                        <!--<div panel-title data-title="'换届选举'"></div>-->
-                        <!--<div class="main_list" style="overflow: hidden;">-->
-                            <!--<ul class="list-group" style="margin: 0 5px;">-->
-                                <!--<li class="" style="padding: 5px 0;">-->
-                                    <!--<span>党委将于{{PartyTotalInfo.GJJMRQ==null?'xx年xx月xx日':PartyTotalInfo.GJJMRQ}}到期换届</span>-->
-                                <!--</li>-->
-                                <!--<li class="" style="padding: 5px 0;">-->
-                                    <!--<span>{{year}}年共有{{PartyTotalInfo.JCNUMBER}}个党总支（支部）到期换届</span>-->
-                                <!--</li>-->
-                            <!--</ul>-->
-                        <!--</div>-->
-
-                    </div>
-                    <div ng-if="dataScope==3 || dataScope==4 || dataScope==8" class="body" role-permission-code="mainindex.workWarning2"
-                         style="padding-top: 0px;">
-                        <div>
-                            <!-- <div panel-title data-title="'本月重点'" style="padding-top: 0px;"></div>
-                             <div class="main_list" style="overflow: hidden;">
-                                 <ul class="list-group" style="margin: 0 5px;">
-                                     <li class="" style="padding: 5px 0;">
-                                         <span>1.职工思想动态。</span>
-                                         <span style="float: right;color: #23C4D8;">待处理</span>
-                                     </li>
-                                     <li class="">
-                                         <span>2.党费收缴工作。 </span>
-                                         <span style="float: right;">已处理</span>
-                                     </li>
-                                 </ul>
-                             </div>-->
-                            <!--<div panel-title data-title="'发展党员'"></div>-->
-                            <!--<div class="main_list" style="overflow: hidden;">-->
-                                <!--<ul class="list-group" style="margin: 0 5px;">-->
-                                    <!--<li ng-if="partyUserExpendTotal.length==0" style="padding: 12px 0;" >暂无</li>-->
-                                    <!--<li ng-if="partyUserExpendTotal.length>0" ng-repeat="item in partyUserExpendTotal" style="padding: 2px 0;" >-->
-                                        <!--<span>{{$index+1}}.{{item.msg}}</span>-->
-                                        <!--<span class="warning-label"-->
-                                              <!--ng-class="item.num>0?'warning-label-bule':''"-->
-                                              <!--ng-click="showPartyExpend(item.pflowid,item.beginSort,item.endSort)">{{item.num>0?'待处理':'已处理'}}</span>-->
-                                    <!--</li>-->
-                                <!--</ul>-->
-                            <!--</div>-->
-                        </div>
-                        <!--<div panel-title data-title="'组织生活'"></div>-->
-                        <!--<div class="main_list" style="overflow: hidden;">-->
-                            <!--<ul class="list-group" style="margin: 0 5px;">-->
-                                <!--<li class="" style="padding: 5px 0;">-->
-                                    <!--<span>1.开展主题党日。</span>-->
-                                    <!--<span class="warning-label"-->
-                                          <!--ng-class="PartyTotalInfo.DRNUMBER>0?'':'warning-label-bule'"-->
-                                          <!--ng-click="showZtdrExpend()">{{PartyTotalInfo.DRNUMBER>0?'已处理':'待处理'}}</span>-->
-                                <!--</li>-->
-                                <!--<li class="" style="padding: 5px 0;">-->
-                                    <!--<span>2.开展当前季度三会一课。</span>-->
-                                    <!--<span class="warning-label"-->
-                                          <!--ng-class="!shykTotalWarn?'':'warning-label-bule'"-->
-                                          <!--ng-click="showShykTotal()">{{!shykTotalWarn>0?'已完成':'待处理'}}</span>-->
-                                <!--</li>-->
-                            <!--</ul>-->
-                        <!--</div>-->
-                        <!--<div panel-title data-title="'换届选举'"></div>-->
-                        <!--<div class="main_list" style="overflow: hidden;">-->
-                            <!--<ul class="list-group" style="margin: 0 5px;">-->
-                                <!--<li class="" style="padding: 5px 0;">-->
-                                    <!--<span ng-if="partyUserInfo.isGroupReplace">党支部将于{{partyUserInfo.dzz_gjjmrq | date:'yyyy年MM月dd日'}}到期换届</span>-->
-                                    <!--<span ng-if="!partyUserInfo.isGroupReplace">暂无</span>-->
-                                <!--</li>-->
-                            <!--</ul>-->
-                        <!--</div>-->
-                    </div>
-                    <!--<div ng-if="dataScope==5 || dataScope==6 || dataScope==999" class="body"-->
-                         <!--role-permission-code="mainindex.workWarning3" style="padding-top: 0px;">-->
-                        <div  class="body"
-                              style="padding-top: 0px;">
-                        <div class="table-responsive">
-                            <table class="table table-bordered table-layout">
-                                <thead>
-                                <tr>
-                                    <th>会议名称</th>
-                                    <th class="col-md-5">开始时间</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr ng-repeat="it in myshykdataList|limitTo: 5">
-                                    <td class="td_long_content" style="cursor: pointer;" ng-click="showShykData(it.MEETINGID,it.meetingType)">{{it.MEETINGNAME}}</td>
-                                    <td class="td_long_content">{{it.BEGINTIME | date:'yyyy-MM-dd HH:mm'}}
-                                    </td>
-                                </tr>
-                                <tr ng-if="myshykdataList.length<=0">
-                                    <td colspan="2" style="text-align:center">暂无会议</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="body" role-permission-code="mainindex.workWarning4"
-                         style="padding-top: 0px;">
-                        <div>
-                            <!-- <div panel-title data-title="'本月重点'" style="padding-top: 0px;"></div>
-                             <div class="main_list" style="overflow: hidden;">
-                                 <ul class="list-group" style="margin: 0 5px;">
-                                     <li class="" style="padding: 5px 0;">
-                                         <span>1.职工思想动态。</span>
-                                         <span style="float: right;color: #23C4D8;">待处理</span>
-                                     </li>
-                                     <li class="">
-                                         <span>2.党费收缴工作。 </span>
-                                         <span style="float: right;">已处理</span>
-                                     </li>
-                                 </ul>
-                             </div>-->
-                            <!--<div panel-title data-title="'发展党员'"></div>-->
-                            <!--<div class="main_list" style="overflow: hidden;">-->
-                                <!--<ul class="list-group" style="margin: 0 5px;">-->
-                                    <!--<li ng-if="partyUserExpendTotal.length==0" style="padding: 12px 0;" >暂无</li>-->
-                                    <!--<li ng-if="partyUserExpendTotal.length>0" ng-repeat="item in partyUserExpendTotal" style="padding: 2px 0;" >-->
-                                        <!--<span>{{$index+1}}.{{item.msg}}</span>-->
-                                        <!--<span class="warning-label"-->
-                                              <!--ng-class="item.num>0?'warning-label-bule':''"-->
-                                              <!--ng-click="showPartyExpend(item.pflowid,item.beginSort,item.endSort)">{{item.num>0?'待处理':'已处理'}}</span>-->
-                                    <!--</li>-->
-                                <!--</ul>-->
-                            <!--</div>-->
+                        <div panel-title data-title="'领导人员落实组织生活制度情况'"></div>
+                        <div class="main_list" style="overflow: hidden;">
+                            <ul class="list-group" style="margin: 0 5px;">
+                                <li class="" style="padding: 5px 0;">
+                                    <span>暂无</span>
+                                </li>
+                            </ul>
                         </div>
-                        <!--<div panel-title data-title="'换届选举'"></div>-->
-                        <!--<div class="main_list" style="overflow: hidden;">-->
-                            <!--<ul class="list-group" style="margin: 0 5px;">-->
-                                <!--<li class="" style="padding: 5px 0;">-->
-                                    <!--<span>党委将于{{PartyTotalInfo.GJJMRQ==null?'xx年xx月xx日':PartyTotalInfo.GJJMRQ}}到期换届</span>-->
-                                <!--</li>-->
-                                <!--<li class="" style="padding: 5px 0;">-->
-                                    <!--<span>{{year}}年共有{{PartyTotalInfo.JCNUMBER}}个党总支（支部）到期换届</span>-->
-                                <!--</li>-->
-                            <!--</ul>-->
-                        <!--</div>-->
-                    </div>
-                    <div class="body" role-permission-code="mainindex.workWarning5"
-                         style="padding-top: 0px;">
-                        <div ng-if="worktag==1">
-                            <!--<div panel-title data-title="'领导人员落实组织生活“5+3”制度情况'"></div>-->
-                            <!--<div style="display: flex;">-->
-                                <!--<div class="leadwarning">-->
-                                    <!--<table style="border-collapse: separate;border-spacing: 0em 0.4em">-->
-                                        <!--<tr ng-repeat="item in getLeaderData(1)">-->
-                                            <!--<th>-->
-                                                <!--<span>{{$index+1}}.{{item.leaderTypeName}}<spam ng-if="item.leaderType!=5">（{{item.totalTypeName}}）</spam></span>-->
-                                            <!--</th>-->
-                                            <!--<td>-->
-                                            <!--<span ng-if="item.leaderType!=5" class="leadwarning-number"-->
-                                                  <!--ng-class="item.count>=item.baseCount?'':'warning-label-bule'"-->
-                                                  <!--ng-click="showFSDetail(item)">{{item.count>=item.baseCount?'已完成':'未完成'}}</span>-->
-                                                <!--<span ng-if="item.leaderType==5" class="leadwarning-number" ng-click="showFSDetail(item)">{{item.count}}</span>-->
-                                                <!--<div class="leadwarning-bottomline"></div>-->
-                                            <!--</td>-->
-                                        <!--</tr>-->
-                                    <!--</table>-->
-                                <!--</div>-->
-                                <!--<div class="leadwarning-add">-->
-                                    <!--+-->
-                                <!--</div>-->
-                                <!--<div class="leadwarning">-->
-                                    <!--<table style="border-collapse: separate;border-spacing: 0em 0.5em">-->
-                                        <!--<tr ng-repeat="item in getLeaderData(2)">-->
-                                            <!--<th>-->
-                                                <!--<span>{{$index+1}}.{{item.leaderTypeName}}（{{item.totalTypeName}}）</span>-->
-                                            <!--</th>-->
-                                            <!--<td>-->
-                                            <!--<span class="leadwarning-number"-->
-                                                  <!--ng-class="item.count>=item.baseCount?'':'warning-label-bule'"-->
-                                                  <!--ng-click="showFSDetail(item)">{{item.count>=item.baseCount?'已完成':'未完成'}}</span>-->
-                                                <!--<div class="leadwarning-bottomline"></div>-->
-                                            <!--</td>-->
-                                        <!--</tr>-->
-                                    <!--</table>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <!--<div panel-title data-title="'中心组学习情况'"></div>-->
-                            <!--<div class="leadwarning-zxzxx">-->
-                                <!--<div class="leadwarning-zxzxx-item">-->
-                                    <!--<span>集中学习（1次/月）</span>-->
-                                    <!--<div>-->
-                                    <!--<span class="leadwarning-zxzxx-item-number"-->
-                                          <!--ng-click="showZxzxxqkDetail(1)">{{getZxzxxqkTotal(1)}}</span>-->
-                                        <!--<div class="leadwarning-zxzxx-item-line"></div>-->
-                                    <!--</div>-->
-                                <!--</div>-->
-                                <!--<div class="leadwarning-zxzxx-item"-->
-                                     <!--style="padding-left: 15px;">-->
-                                    <!--<span>重点发言（1gong次/年）</span>-->
-                                    <!--<div>-->
-                                    <!--<span class="leadwarning-zxzxx-item-number"-->
-                                          <!--ng-click="showZxzxxqkDetail(1)">{{getZdfyNum(1)}}</span>-->
-                                        <!--<div class="leadwarning-zxzxx-item-line"></div>-->
-                                    <!--</div>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <!--<div panel-title data-title="'换届选举'"></div>-->
-                            <!--<div class="main_list" style="overflow: hidden;">-->
-                                <!--<ul class="list-group" style="margin: 0 5px;">-->
-                                    <!--<li class="" style="padding: 5px 0;">-->
-                                        <!--<span>党委将于{{PartyTotalInfo.GJJMRQ==null?'xx年xx月xx日':PartyTotalInfo.GJJMRQ}}到期换届</span>-->
-                                    <!--</li>-->
-                                    <!--<li class="" style="padding: 5px 0;">-->
-                                        <!--<span>{{year}}年共有{{PartyTotalInfo.JCNUMBER}}个党总支（支部）到期换届</span>-->
-                                    <!--</li>-->
-                                <!--</ul>-->
-                            <!--</div>-->
+                        <div panel-title data-title="'换届选举'"></div>
+                        <div class="main_list" style="overflow: hidden;">
+                            <ul class="list-group" style="margin: 0 5px;">
+                                <li class="" style="padding: 5px 0;">
+                                    <span ng-if="partyUserInfo.isGroupReplace">党支部将于{{partyUserInfo.dzz_gjjmrq | date:'yyyy年MM月dd日'}}到期换届</span>
+                                    <span ng-if="!partyUserInfo.isGroupReplace">暂无</span>
+                                </li>
+                            </ul>
                         </div>
-                        <!--<div ng-if="worktag==0">-->
-                            <!--<div panel-title data-title="'发展党员'"></div>-->
-                            <!--<div class="main_list" style="overflow: hidden;">-->
-                                <!--<ul class="list-group" style="margin: 0 5px;">-->
-                                    <!--<li ng-if="partyUserExpendTotal.length==0" style="padding: 12px 0;" >暂无</li>-->
-                                    <!--<li ng-if="partyUserExpendTotal.length>0" ng-repeat="item in partyUserExpendTotal" style="padding: 2px 0;" >-->
-                                        <!--<span>{{$index+1}}.{{item.msg}}</span>-->
-                                        <!--<span class="warning-label"-->
-                                              <!--ng-class="item.num>0?'warning-label-bule':''"-->
-                                              <!--ng-click="showPartyExpend(item.pflowid,item.beginSort,item.endSort)">{{item.num>0?'待处理':'已处理'}}</span>-->
-                                    <!--</li>-->
-                                <!--</ul>-->
-                            <!--</div>-->
-                        <!--</div>-->
                     </div>
                 </div>
             </div>