diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 0182065a..b94c7bbf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -210,59 +210,23 @@ public class SarStandardsInfoController extends BaseController @GetMapping("/getSarStandardsInfoPageBak") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") public ResponseMessage> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { -// int isNull = -1; -// if (null != page.getNowOrderBy()) { -// switch (page.getNowOrderBy()) { -// case 1: -// page.setOrderByA("issueTime");//发布日期 -// break; -// case 2: -// page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期 -// break; -// case 3: -// page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期 -// break; -// case 4: -// page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态 -// break; -// case 5: -// page.setOrderByA("paixu"); -// break; -// case 6: -// page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ"); -// break; -// default: -// page.setNowOrder(null); -// break; -// } -// if (null != page.getNowOrder()) { -// switch (page.getNowOrder()) { -// case 1: -// page.setOrder1("desc"); -// break; -// case 2: -// page.setOrder1("asc"); -// default: -// page.setOrder1(null); -// break; -// } -// } -// } -// -// -// if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { -// List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); -// String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); -// if (StringUtils.isNotBlank(advanceStr)) { -// page.setAdvanceSearchStr(advanceStr); -// } else { -// page.setAdvanceSearchStr(null); -// } -// } -// -// if(page.getUserId() == null || page.getUserId().equals("")){ -// page.setUserId(LoginUserUtil.getUserId()); -// } + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } List rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak1(page); return Result.success(getPageInfo(page.getPager(), rows)); }