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