Browse Source

民主评议党员

lizeyu 4 months ago
parent
commit
a3125dbadc

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

+ 2 - 2
src/main/resources/static/app/main/partyTwoExt/mzpyxx/list.html

@@ -81,7 +81,7 @@
                                                        ng-change="search()"
                                                        autocomplete="off"
                                                        autoclose="true"
-                                                       data-date-format="yyyyMMdd" data-date-type="string"
+                                                       data-date-format="yyyyMMdd" data-date-type="date"
                                                        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="string"
+                                                       data-date-format="yyyyMMdd" data-date-type="date"
                                                        ng-model="selectparams.endTime"
                                                        placeholder="" bs-datepicker/>
                                             </div>