Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/.gitignore

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>

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