Merge branch 'master' of http://39.98.153.250:9080/bowintek/GHSCPartyBuild

.idea/.gitignore

@@ -1,9 +1,9 @@
 # 默认忽略的文件
 /shelf/
 /workspace.xml
-/GHSCPartyBuild.iml
 # 基于编辑器的 HTTP 客户端请求
 /httpRequests/
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+*.iml

.idea/GHSCPartyBuild.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

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);
+

src/main/java/com/ghsc/partybuild/controller/partyLife/PfDnjzjyController.java

@@ -35,8 +35,8 @@ public class PfDnjzjyController {
     @ResponseBody
     @GetMapping("/getList")
     public RequsetData<PageInfo<PfDnjzjyVo>> getList(int pageindex, int pagesize, @RequestParam(required = false) String dzzdm, 
-                                                             @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date startDate, 
-                                                             @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date endDate,
+                                                             @RequestParam(required = false) String startDate,
+                                                             @RequestParam(required = false) String endDate,
                                                              @RequestParam(required = false) String zt) {
         RequsetData<PageInfo<PfDnjzjyVo>> result = new RequsetData<>();
         result.setItem(pfDnjzjyService.getList(pageindex, pagesize, null, dzzdm, startDate, endDate, zt));
@@ -111,8 +111,8 @@ public class PfDnjzjyController {
 
     @RequestMapping(value = "/export", method = RequestMethod.GET)
     public void exportLeaderTeam(HttpServletResponse response, @RequestParam(required = false) String dzzdm,
-                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date startDate,
-                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date endDate,
+                                 @RequestParam(required = false) String startDate,
+                                 @RequestParam(required = false) String endDate,
                                  @RequestParam(required = false) String zt) throws Exception {
         /**查询数据**/
         List<PfDnjzjyVo> dataList = pfDnjzjyService.getList(1, 100000, null, dzzdm, startDate, endDate, zt).getList();

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

@@ -7,7 +7,7 @@ import java.util.Date;
 import java.util.List;
 
 public interface PfDnjzjyCQuery {
-    List<PfDnjzjyVo> selectPfDnjzjyList(@Param("id") String id, @Param("dzzdm") String dzzdm, @Param("startDate") Date startDate,
-                                        @Param("endDate") Date endDate, @Param("zt") String zt);
+    List<PfDnjzjyVo> selectPfDnjzjyList(@Param("id") String id, @Param("dzzdm") String dzzdm, @Param("startDate") String startDate,
+                                        @Param("endDate") String endDate, @Param("zt") String zt);
 
 }

src/main/java/com/ghsc/partybuild/service/impl/partyLife/PfDnjzjyServiceImpl.java

@@ -25,7 +25,7 @@ public class PfDnjzjyServiceImpl implements PfDnjzjyService {
     private StringUtils stringUtils;
 
     @Override
-    public PageInfo<PfDnjzjyVo> getList(int pageIndex, int pageSize, String id, String dzzdm, Date startDate, Date endDate, String zt){
+    public PageInfo<PfDnjzjyVo> getList(int pageIndex, int pageSize, String id, String dzzdm, String startDate, String endDate, String zt){
         PageHelper.startPage(pageIndex, pageSize);
         List<PfDnjzjyVo> list = pfDnjzjyCQuery.selectPfDnjzjyList(id, dzzdm, startDate, endDate, zt);
 

src/main/java/com/ghsc/partybuild/service/partyLife/PfDnjzjyService.java

@@ -3,11 +3,10 @@ package com.ghsc.partybuild.service.partyLife;
 import com.ghsc.partybuild.vo.partyLife.PfDnjzjyVo;
 import com.github.pagehelper.PageInfo;
 
-import java.util.Date;
 import java.util.List;
 
 public interface PfDnjzjyService {
-    PageInfo<PfDnjzjyVo> getList(int pageIndex, int pageSize, String id, String dzzdm, Date startDate, Date endDate, String zt);
+    PageInfo<PfDnjzjyVo> getList(int pageIndex, int pageSize, String id, String dzzdm, String startDate, String endDate, String zt);
 
     PfDnjzjyVo getPfDnjzjyById(String id);
 

src/main/resources/mapping/PfDnjzjyCQuery.xml

@@ -35,7 +35,7 @@
                   and (pd.jykssj <![CDATA[ <= ]]> #{endDate} and pd.jyjssj <![CDATA[ >= ]]> #{startDate})
               </when>
               <when test="startDate!=null and startDate!=''">
-                  and pd.jykssj <![CDATA[ <= ]]> #{startDate}
+                  and pd.jykssj <![CDATA[ >= ]]> #{startDate}
               </when>
               <when test="startDate!=null and startDate!=''">
                   and pd.jyjssj <![CDATA[ <= ]]> #{endDate}

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

@@ -27,6 +27,38 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
+                                        <label>评选级别</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <select style="height: 100%;" name="pxjb"
+                                                        ng-model="selectparams.pxjb" class="form-control"
+                                                        ng-change="search()"
+                                                        ng-options="type.dickey as type.dicvalue for type in pxjbTypeList">
+                                                    <option value="">--全部--</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
+                                        <label>评选类别</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <select style="height: 100%;" name="pxlb"
+                                                        ng-model="selectparams.pxlb" class="form-control"
+                                                        ng-change="search()"
+                                                        ng-options="type.dickey as type.dicvalue for type in pxlbTypeList">
+                                                    <option value="">--全部--</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row clearfix form-inline" ng-show="isShow">
                                     <div class="col-lg-2 col-md-2 dj-label">
                                         <label>评选启动时间</label>
                                     </div>
@@ -50,23 +82,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
-                                        <label>评选级别</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <select style="height: 100%;" name="pxjb"
-                                                        ng-model="selectparams.pxjb" class="form-control"
-                                                        ng-change="search()"
-                                                        ng-options="type.dickey as type.dicvalue for type in pxjbTypeList">
-                                                    <option value="">--全部--</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row clearfix form-inline" ng-show="isShow">
                                     <div class="col-lg-2 col-md-2 dj-label">
                                         <label>评选结果确定时间</label>
                                     </div>
@@ -90,28 +105,13 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
-                                        <label>评选类别({{selectparams.pxlb}})</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <select style="height: 100%;" name="pxlb"
-                                                        ng-model="selectparams.pxlb" class="form-control"
-                                                        ng-change="search()"
-                                                        ng-options="type.dickey as type.dicvalue for type in pxlbTypeList">
-                                                    <option value="">--全部--</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
                                 </div>
                             </form>
                         </div>
                         <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>
+                                <span class="moreSpan" ng-click="isShow = !isShow;" style='padding-right:1em;cursor:pointer;'>
+                                    {{isShow ? "收起" : "更多"}}<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>
@@ -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">

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

@@ -2,7 +2,6 @@
     $app.module('gtPartyApp').controller('pf_djscgzListCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
         $scope.loginUserId = AuthUser.getUser().Id;
         $scope.isShow = true;
-        $scope.moreTxt = "更多";
         $scope.isAll = false;
         $scope.tabNameAdd = "home.pf_djscgzAdd";
         $scope.tabNameEdit = "home.pf_djscgzEdit";
@@ -28,10 +27,10 @@
             dzzdm: '',
             pxqdsjks: null,
             pxqdsjjs: null,
-            pxjb: null,
+            pxjb: '',
             pxjgqdsjks: null,
             pxjgqdsjjs: null,
-            pxlb: null
+            pxlb: ''
         };
         $scope.resetSelectparams = angular.copy($scope.selectparams);
         $scope.pageInfo = {ptotal: 0};
@@ -188,10 +187,6 @@
             $scope.treeparams.isunfold = !$scope.treeparams.isunfold;
             $scope.$emit('menudatas.toggle', !$scope.treeparams.isunfold);
         };
-        $scope.isShowClick = function () {
-            $scope.isShow = !$scope.isShow;
-            $scope.moreTxt = $scope.isShow ? "收起" : "更多";
-        };
         $scope.reset = function () {
             $scope.selectparams = angular.copy($scope.resetSelectparams);
             $scope.treeparams = angular.copy($scope.resetTreeparams);

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>