|
@@ -1,5 +1,6 @@
|
|
|
package com.xjrsoft.module.student.service.impl;
|
|
package com.xjrsoft.module.student.service.impl;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
@@ -134,8 +135,38 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
|
|
|
.selectAs(BaseSemester::getName, PbVXsxxsfytbPageVo::getBaseSemesterCn)
|
|
.selectAs(BaseSemester::getName, PbVXsxxsfytbPageVo::getBaseSemesterCn)
|
|
|
.select(PbVXsxxsfytb.class, x -> VoToColumnUtil.fieldsToColumns(PbVXsxxsfytbPageVo.class).contains(x.getProperty()))
|
|
.select(PbVXsxxsfytb.class, x -> VoToColumnUtil.fieldsToColumns(PbVXsxxsfytbPageVo.class).contains(x.getProperty()))
|
|
|
;
|
|
;
|
|
|
-
|
|
|
|
|
- return this.selectJoinListPage(ConventPage.getPage(dto), PbVXsxxsfytbPageVo.class, pbVXsxxsfytbMPJLambdaWrapper);
|
|
|
|
|
|
|
+ if(StrUtil.isNotEmpty(dto.getField()) && StrUtil.isNotEmpty(dto.getOrder())){
|
|
|
|
|
+ if("asc".equals(dto.getOrder())){
|
|
|
|
|
+ if("baseSemesterCn".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(BaseSemester::getName);
|
|
|
|
|
+ }else if("feeobjname".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getFeeobjname);
|
|
|
|
|
+ }else if("personalid".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getPersonalid);
|
|
|
|
|
+ }else if("sex".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getSex);
|
|
|
|
|
+ }else if("feeitemname".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getFeeitemname);
|
|
|
|
|
+ }else if("factar".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getFactar);
|
|
|
|
|
+ }
|
|
|
|
|
+ }else if("desc".equals(dto.getOrder())){
|
|
|
|
|
+ if("baseSemesterCn".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(BaseSemester::getName);
|
|
|
|
|
+ }else if("feeobjname".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(PbVXsxxsfytb::getFeeobjname);
|
|
|
|
|
+ }else if("personalid".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(PbVXsxxsfytb::getPersonalid);
|
|
|
|
|
+ }else if("sex".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(PbVXsxxsfytb::getSex);
|
|
|
|
|
+ }else if("feeitemname".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(PbVXsxxsfytb::getFeeitemname);
|
|
|
|
|
+ }else if("factar".equals(dto.getField())){
|
|
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(PbVXsxxsfytb::getFactar);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ return this.selectJoinListPage(ConventPage.getPageCustomOrder(dto), PbVXsxxsfytbPageVo.class, pbVXsxxsfytbMPJLambdaWrapper);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|