|
@@ -1,6 +1,7 @@
|
|
package org.jeecg.modules.ctop.service.impl;
|
|
package org.jeecg.modules.ctop.service.impl;
|
|
|
|
|
|
import cn.com.ctop.common.module.utils.CtopAdConstant;
|
|
import cn.com.ctop.common.module.utils.CtopAdConstant;
|
|
|
|
+import cn.com.ctop.common.module.utils.StringUtils;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -22,6 +23,7 @@ public class MaterialTopServiceImpl implements IMaterialTopService {
|
|
public IPage<MaterialTopVO> selectByPage(String endDate, String startDate, String target, String order, int pageNo, int pageSize) {
|
|
public IPage<MaterialTopVO> selectByPage(String endDate, String startDate, String target, String order, int pageNo, int pageSize) {
|
|
QueryWrapper<MaterialTopVO> wrapper = new QueryWrapper();
|
|
QueryWrapper<MaterialTopVO> wrapper = new QueryWrapper();
|
|
wrapper.ge("stat_date", startDate).le("stat_date", endDate);
|
|
wrapper.ge("stat_date", startDate).le("stat_date", endDate);
|
|
|
|
+ target = StringUtils.humpToLine2(target);
|
|
if(order.equals(CtopAdConstant.COMMON_ORDER_TYPE_ASC)){
|
|
if(order.equals(CtopAdConstant.COMMON_ORDER_TYPE_ASC)){
|
|
wrapper.orderByAsc(target);
|
|
wrapper.orderByAsc(target);
|
|
}else{
|
|
}else{
|