参数模板明细-表头排序。
This commit is contained in:
+1
-1
@@ -126,7 +126,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
|||||||
String paramsManifestId = paramsReportDetailVO.getParamsManifestId();
|
String paramsManifestId = paramsReportDetailVO.getParamsManifestId();
|
||||||
|
|
||||||
// 如果排序字段不为空
|
// 如果排序字段不为空
|
||||||
if(StringUtils.isNotEmpty(paramsReportDetailVO.getOrderByField())){`
|
if(StringUtils.isNotEmpty(paramsReportDetailVO.getOrderByField())){
|
||||||
StringBuilder sqlSb = new StringBuilder();
|
StringBuilder sqlSb = new StringBuilder();
|
||||||
sqlSb.append(" ORDER BY ").append(paramsReportDetailVO.getOrderByField());
|
sqlSb.append(" ORDER BY ").append(paramsReportDetailVO.getOrderByField());
|
||||||
if(StringUtils.equals(paramsReportDetailVO.getOrderBy(),"1")){
|
if(StringUtils.equals(paramsReportDetailVO.getOrderBy(),"1")){
|
||||||
|
|||||||
+13
-2
@@ -108,8 +108,19 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
queryWrapper.like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), "pi.params_name", paramsInfoEO.getParamsName())
|
queryWrapper.like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), "pi.params_name", paramsInfoEO.getParamsName())
|
||||||
.eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), "pi.duty_territory", paramsInfoEO.getDutyTerritory())
|
.eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), "pi.duty_territory", paramsInfoEO.getDutyTerritory());
|
||||||
.orderBy(true, "asc".equals(orderBy)?true:false, "pi.nio_number");
|
// 如果排序字段不为空
|
||||||
|
if(StringUtils.isNotEmpty(orderByField)){
|
||||||
|
// if (StringUtils.equals(orderBy,"2")) {
|
||||||
|
// orderBy = " DESC";
|
||||||
|
// }else {
|
||||||
|
// orderBy = " ASC";
|
||||||
|
// }
|
||||||
|
queryWrapper.orderBy(true, "asc".equals(orderBy)?true:false, orderByField);
|
||||||
|
}else {
|
||||||
|
queryWrapper.orderBy(true, "asc".equals(orderBy)?true:false, "pi.nio_number");
|
||||||
|
}
|
||||||
|
|
||||||
Page<ParamsInfoEO> page = new Page<ParamsInfoEO>(pageNo, pageSize);
|
Page<ParamsInfoEO> page = new Page<ParamsInfoEO>(pageNo, pageSize);
|
||||||
// IPage<ParamsInfoEO> pageList = paramsInfoEOService.page(page, queryWrapper);
|
// IPage<ParamsInfoEO> pageList = paramsInfoEOService.page(page, queryWrapper);
|
||||||
IPage<ParamsInfoEO> pageList = paramsInfoEOService.selectpage(page, queryWrapper);
|
IPage<ParamsInfoEO> pageList = paramsInfoEOService.selectpage(page, queryWrapper);
|
||||||
|
|||||||
@@ -214,6 +214,10 @@ export default {
|
|||||||
let _i = sorter.order === 'descend' ? 'asc': 'desc'
|
let _i = sorter.order === 'descend' ? 'asc': 'desc'
|
||||||
if(sorter.columnKey == 'dutyTerritory_dictText'){
|
if(sorter.columnKey == 'dutyTerritory_dictText'){
|
||||||
sorter.columnKey = 'duty_territory'
|
sorter.columnKey = 'duty_territory'
|
||||||
|
} else if(sorter.columnKey == 'createTime'){
|
||||||
|
sorter.columnKey = 'create_time'
|
||||||
|
} else if(sorter.columnKey == 'nioNumber'){
|
||||||
|
sorter.columnKey = 'nio_number'
|
||||||
}
|
}
|
||||||
let _tt = {
|
let _tt = {
|
||||||
orderByField: sorter.columnKey,
|
orderByField: sorter.columnKey,
|
||||||
|
|||||||
Reference in New Issue
Block a user