民主评议党员

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

@@ -1182,8 +1182,8 @@ public class PartyTwoController {
                                                                         @RequestParam(required = false) String beginTime,
                                                                         @RequestParam(required = false) String endTime,
                                                                         @RequestParam(required = false) String pyjg) {
-        beginTime = dateUtils.strFormat_short(beginTime);
-        endTime = dateUtils.strFormat_short(endTime);
+//        beginTime = dateUtils.strFormat_short(beginTime);
+//        endTime = dateUtils.strFormat_short(endTime);
         RequsetData<PageInfo<HashMap<String, Object>>> result = new RequsetData<>();
         result.setItem(partyTwoService.getMzpyxxList(pageIndex, pageSize, username, rybm, dzzdm, beginTime, endTime, pyjg));
         return result;
@@ -1198,8 +1198,8 @@ public class PartyTwoController {
                              @RequestParam(required = false) String endTime,
                              @RequestParam(required = false) String pyjg) throws Exception {
 
-        beginTime = dateUtils.strFormat_short(beginTime);
-        endTime = dateUtils.strFormat_short(endTime);
+//        beginTime = dateUtils.strFormat_short(beginTime);
+//        endTime = dateUtils.strFormat_short(endTime);
         /**查询数据**/
         List<HashMap<String, Object>> dataList = partyTwoService.getMzpyxxList(1, 9999, username, rybm, dzzdm, beginTime, endTime, pyjg).getList();
 

src/main/resources/mapping/PartyTwoCQuery.xml

@@ -501,7 +501,7 @@
             and p.kzpyrq <![CDATA[ >= ]]> #{beginTime}
         </if>
         <if test="endTime != null and endTime != '' ">
-            and p.kzpyrq <![CDATA[ <= ]]> #{endTime}
+            and p.jspyrq <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="username!=null and username !=''">
             and ry.xm like concat('%',#{username},'%')

src/main/resources/static/app/main/partyTwoExt/mzpyxx/list.html

@@ -44,7 +44,7 @@
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <input name="xm" class="form-control" type="text"
+                                                <input name="username" class="form-control" type="text"
                                                        ng-keypress="($event.which === 13)?search():0"
                                                        ng-model="selectparams.username"
                                                        placeholder=""/>
@@ -81,7 +81,7 @@
                                                        ng-change="search()"
                                                        autocomplete="off"
                                                        autoclose="true"
-                                                       data-date-format="yyyyMMdd" data-date-type="date"
+                                                       data-date-format="yyyyMMdd" data-date-type="string"
                                                        ng-model="selectparams.beginTime"
                                                        placeholder="" bs-datepicker/>
                                             </div>
@@ -97,7 +97,7 @@
                                                        ng-change="search()"
                                                        autocomplete="off"
                                                        autoclose="true"
-                                                       data-date-format="yyyyMMdd" data-date-type="date"
+                                                       data-date-format="yyyyMMdd" data-date-type="string"
                                                        ng-model="selectparams.endTime"
                                                        placeholder="" bs-datepicker/>
                                             </div>
@@ -109,8 +109,9 @@
                         <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>
+                                      style='padding-right:1em;cursor:pointer;'>{{moreTxt}}
+                                    <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/partyTwoExt/mzpyxx/list.js

@@ -194,6 +194,7 @@
             $scope.selectparams.pyjg = $scope.resetparams.pyjg;
             $scope.selectparams.beginTime = $scope.resetparams.beginTime;
             $scope.selectparams.endTime = $scope.resetparams.endTime;
+            $scope.loadData();
         }
     });
 })(angular);