lizeyu 8 месяцев назад
Родитель
Сommit
1905714172

+ 68 - 1
lib/数据更新脚本.txt

@@ -9,4 +9,71 @@ VALUES ('67ddad23-18a3-4336-b3ca-f148ff220589', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3
 INSERT INTO CF_MENU (MENUID, APPLICATIONID, PARENTMENUID, MNUSYSTEM, MENUORDER, MENUNO, MENUNAME, MENUPROGRAM, MENUPIC, MENUDESC, ISVISIBLE, ISLEAF, ISBLANK)
 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 ('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);
+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);
+
+
+-- 2024.7.11 专题建设
+-- ----------------------------
+-- Table structure for zz_mzpyxx
+-- ----------------------------
+DROP TABLE IF EXISTS `pf_dnjzjy`;
+CREATE TABLE `pf_dnjzjy`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
+  `dzzdm` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '面向对象(选择党组织)',
+  `jykssj` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '教育开始时间',
+  `jyjssj` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '教育结束时间',
+  `zt` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '主题',
+  `zygzbz` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '主要工作步骤',
+  `qddcx` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '取得的成效',
+  `create_time` datetime NULL  DEFAULT NULL COMMENT '创建时间',
+  `create_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+  `update_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC COMMENT'党内集中教育';
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+-- 党建“双创”工作
+DROP TABLE IF EXISTS `pf_djscgz`;
+CREATE TABLE `pf_djscgz`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
+  `dzzdm` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '党组织(工作室)名称',
+  `pxqdsj` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '评选启动时间',
+  `pxjgqdsj` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '评选结果确定时间',
+  `pxjb` int NULL DEFAULT NULL COMMENT '评选级别 pxjbType',
+  `pxlb` int NULL DEFAULT NULL COMMENT '评选类别 pxlbType',
+  `zygzbz` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '主要工作步骤',
+  `create_time` datetime NULL  DEFAULT NULL COMMENT '创建时间',
+  `create_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+  `update_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC COMMENT'党建“双创”工作';
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0001-0000-bdb74a278a72', 1, '国家级', 'pxjbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选级别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0002-0000-bdb74a278a72', 2, '省级', 'pxjbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选级别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0003-0000-bdb74a278a72', 3, '市级', 'pxjbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选级别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0004-0000-bdb74a278a72', 4, '校级', 'pxjbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选级别', '2019-09-26 15:13:15', 'M', 'N');
+
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0011-0000-bdb74a278a72', 1, '示范高校', 'pxlbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选类别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0022-0000-bdb74a278a72', 2, '标杆院系', 'pxlbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选类别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0033-0000-bdb74a278a72', 3, '样板支部', 'pxlbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选类别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0044-0000-bdb74a278a72', 4, '“双带头人”教师党支部书记工作室', 'pxlbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选类别', '2019-09-26 15:13:15', 'M', 'N');
+
+
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('1f783c90-a760-43db-8946-b24618f90175', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'c4516fca-2dd8-4373-9be8-1df510c8e5e1', NULL, 6, '专题建设', '专题建设', '', '', '', 1, 0, NULL);
+
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('bc66c398-074a-0000-82c1-126d465d1239', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-28bf-4051-813c-4e95032b6937', NULL, 2, 'home.pf_dnjzjyAdd', '新增党内集中教育', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('bc66c398-074a-0001-82c1-126d465d1239', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-28bf-4051-813c-4e95032b6937', NULL, 3, 'home.pf_dnjzjyDetail', '查看党内集中教育详情', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('bc66c398-074a-435c-82c1-126d465d1239', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-28bf-4051-813c-4e95032b6937', NULL, 1, 'home.pf_dnjzjyEdit', '编辑党内集中教育', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-28bf-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1f783c90-a760-43db-8946-b24618f90175', NULL, 1, 'home.pf_dnjzjyList', '党内集中教育', '', '', '', 1, 0, 0);
+
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0003-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-0000-4051-813c-4e95032b6937', NULL, 2, 'home.pf_djscgzAdd', '新增党建“双创”工作', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0002-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-0000-4051-813c-4e95032b6937', NULL, 3, 'home.pf_djscgzDetail', '查看党建“双创”工作详情', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0001-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-0000-4051-813c-4e95032b6937', NULL, 1, 'home.pf_djscgzEdit', '编辑党建“双创”工作', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0000-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1f783c90-a760-43db-8946-b24618f90175', NULL, 2, 'home.pf_djscgzList', '党建“双创”工作', '', '', '', 1, 0, 0);
+

+ 4 - 1
src/main/resources/static/app/main/partylife/djscgz/list.html

@@ -176,7 +176,10 @@
                                     <td>{{it.pxjbtypename}}</td>
                                     <td>{{it.pxlbtypename}}</td>
                                     <td style="min-width: 150px !important;word-wrap: break-word;word-break: break-all;white-space: normal;">{{it.zygzbz}}</td>
-                                    <td>{{it.createusername}}</td>
+                                    <td>{{it.createusername}}
+                                        <img ng-src="../../api/home/showDbImg/127687" onerror="this.src='images/man.jpg'" width="48" height="48"
+                                             alt="User" style="width: 100px;height: 120px;"/>
+                                    </td>
                                     <td>{{it.createTime | date:'yyyy-MM-dd'}}</td>
                                 </tr>
                                 <tr ng-if="dataList.length<=0">

+ 2 - 2
src/main/resources/static/app/main/publicity/position/list.html

@@ -200,8 +200,8 @@
                                     </td>
                                     <td style="width: 120px;">
                                         <img-component data-filerefid="it.PANELID" data-filetypeid="4"
-                                                       data-ismulti="false" data-height="80"
-                                                       data-width="120" data-readonly="true"></img-component>
+                                                       data-ismulti="true" data-height="40"
+                                                       data-width="60" data-readonly="false"></img-component>
                                         <img ng-if="it.PANELID==null || it.PANELID==''" src="images/nopic.png" width="120" height="80"/>
                                     </td>
                                     <td>{{it.POSITIONNAME}}</td>