diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 72557307a..85e9debff 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -import static com.iformall.domain.po.WxBrand.Field.Id_DESC; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index a170ce993..32f32a95f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.vo.WxMerchantVo; @@ -46,7 +47,7 @@ public class WxMerchantController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.setTenantId(getTenantId()); - wxMerchant.setSortColumns(WxMerchant.Field.TopTime_DESC); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } @@ -62,7 +63,7 @@ public class WxMerchantController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.setTenantId(getTenantId()); - wxMerchant.setSortColumns(WxMerchant.Field.TopTime_DESC); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 29590c7a0..ecfc2930c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxShop; import com.iformall.service.WxShopService; import io.swagger.annotations.ApiImplicitParam; @@ -42,7 +43,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); + wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index b230803ee..75e4592ca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchantTradeDaily; import com.iformall.domain.vo.WxMerchantTradeDailyVo; import com.iformall.service.WxMerchantTradeDailyService; @@ -55,7 +56,7 @@ public class WxMerchantTradeDailyController extends BaseController { SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); } - wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.MerchantId_DESC); + wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.MerchantId_DESC); PageInfo page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); return new ResultData(page); @@ -115,7 +116,7 @@ public class WxMerchantTradeDailyController extends BaseController { SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); } - wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.MerchantId_DESC); + wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.MerchantId_DESC); wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index 5b3ce43b6..c7db07834 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -112,7 +112,7 @@ public class WxUserStructureController extends BaseController { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); WxLevelConfig wxLevelConfig = new WxLevelConfig(); wxLevelConfig.setTenantId(getTenantId()); - wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); + wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); List levelList = wxLevelConfigService.findList(wxLevelConfig); for( int i = 0; i < levelList.size(); i++) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java index fea5d1104..f075902d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxActivity; import com.iformall.enums.EnumActivityStatus; import com.iformall.exception.MallinkException; @@ -43,7 +44,7 @@ public class WxActivityController extends BaseController { wxActivity.setStatus(null); } wxActivity.setTenantId(getTenantId()); - wxActivity.setSortColumns(WxActivity.Field.CreateTime_DESC,WxActivity.Field.Id_DESC); + wxActivity.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index f425a3c27..cfa4b8594 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -8,10 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.app.WxAppinfoController; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCouponChannelDto; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxCoupon; -import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponChannelAddVo; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponChannelStatus; @@ -70,7 +67,7 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(null); } wxCouponChannel.setTenantId(getTenantId()); - wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java index 1fd94c458..cdb339215 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java @@ -6,6 +6,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxCouponInject; import com.iformall.service.WxCouponInjectService; @@ -46,7 +47,7 @@ public class WxCouponInjectController extends BaseController { couponInject.setStatus(null); } couponInject.setTenantId(getTenantId()); - couponInject.setSortColumns(WxCouponInject.Field.CreateTime_DESC,WxCouponInject.Field.Id_DESC); + couponInject.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxCouponInjectService.listAsPage(couponInject, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java index 691ee6608..5b68abec3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java @@ -6,6 +6,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxGame; import com.iformall.enums.EnumGameStatus; import com.iformall.service.WxGameService; @@ -38,7 +39,7 @@ public class WxGameController extends BaseController { logger.debug("[" + getIpAddr() + "] WxGameController::list"); if (null == wxGame) wxGame = new WxGame(); wxGame.setTenantId(getTenantId()); - wxGame.setSortColumns(WxGame.Field.Id_DESC); + wxGame.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = wxGameService.listAsPage(wxGame, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 3bd4b1c09..3fb34cd32 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -39,8 +39,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.iformall.domain.po.WxCouponOrder.Field.CreateDate_DESC; - @RestController @RequestMapping("wxCUserBasicInfo") @Api(description = "会员管理相关接口") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java index 9dfcc6cab..63ec08caf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMsgCallback; import com.iformall.service.WxMsgCallbackService; import io.swagger.annotations.ApiImplicitParam; @@ -35,7 +36,7 @@ public class WxMsgCallbackController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::list"); if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); wxMsgCallback.setTenantId(getTenantId()); - wxMsgCallback.setSortColumns(WxMsgCallback.Field.Createtime_DESC); + wxMsgCallback.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 40e6cd6ed..5de01e23c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.msg.WxMsg; import com.iformall.service.WxMsgService; import com.iformall.utils.Constant; @@ -47,7 +48,7 @@ public class WxMsgController extends BaseController { if (null == wxMsg) wxMsg = new WxMsg(); wxMsg.setTenantId(getTenantId()); //wxMsg.setWay(EnumSendWay.TAG.getCode()); - wxMsg.setSortColumns(WxMsg.Field.Createtime_DESC); + wxMsg.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java index f3e80a330..a95e464c0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMsgModel; import com.iformall.service.WxMsgModelService; import io.swagger.annotations.ApiImplicitParam; @@ -33,7 +34,7 @@ public class WxMsgModelController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgModelController::list"); if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); wxMsgModel.setTenantId(getTenantId()); - wxMsgModel.setSortColumns(WxMsgModel.Field.Createtime_DESC); + wxMsgModel.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java index fbede329c..828d536c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMsgSignature; import com.iformall.service.WxMsgSignatureService; import io.swagger.annotations.ApiImplicitParam; @@ -33,7 +34,7 @@ public class WxMsgSignatureController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::list"); if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); wxMsgSignature.setTenantId(getTenantId()); - wxMsgSignature.setSortColumns(WxMsgSignature.Field.Createtime_DESC); + wxMsgSignature.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index dce5ca5ae..3541772a2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxBillProperty; import com.iformall.service.WxBillPropertyService; import io.swagger.annotations.ApiImplicitParam; @@ -39,7 +40,7 @@ public class WxBillPropertyController extends BaseController { wxBillProperty = new WxBillProperty(); } wxBillProperty.setTenantId(getTenantId()); - wxBillProperty.setSortColumns(WxBillProperty.Field.Createtime_DESC,WxBillProperty.Field.Id_DESC); + wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); PageInfo result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 2a6dd38fa..2c968822e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -6,10 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallRole; -import com.iformall.domain.po.MallRolePermission; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.MallUserRole; +import com.iformall.domain.po.*; import com.iformall.enums.EnumUserAdmin; import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallRoleService; @@ -57,7 +54,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::list"); String tenantId = getTenantId(); sysRole.setTenantId(tenantId); - sysRole.setSortColumns(MallRole.Field.Id_DESC); + sysRole.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); for (MallRole r : page.getList()) { MallRolePermission p = new MallRolePermission(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 73cb04a5b..46e65e140 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -77,7 +77,7 @@ public class MallUserInfoController extends BaseController { } userInfo.setTenantId(getTenantId()); - userInfo.setSortColumns(MallUserInfo.Field.CreateTime_DESC,MallUserInfo.Field.Id_DESC); + userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for (MallUserInfo u : page.getList()) { MallUserRole r = new MallUserRole(); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java index 0fa4ad3e1..9dd988b99 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -91,227 +91,82 @@ public class BaseEntity implements Serializable { return result.toString(); } + public void setSortColumns(Field... fields) { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(SortField... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + this.sortColumns=sb.toString(); + + } + public enum SortField { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), + + CreateDate_ASC("`create_date` ASC"), + CreateDate_DESC("`create_date` DESC"), + + UpdateDate_ASC("`update_date` ASC"), + UpdateDate_DESC("`update_date` DESC"), + + Createtime_ASC("`createtime` ASC"), + Createtime_DESC("`createtime` DESC"), + CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), - UpdateTime_ASC("`update_time` ASC"), - UpdateTime_DESC("`update_time` DESC"), - - BusinessId_ASC("`business_id` ASC"), - BusinessId_DESC("`business_id` DESC"), - - Name_ASC("`name` ASC"), - Name_DESC("`name` DESC"), - ParentId_ASC("`parent_id` ASC"), - ParentId_DESC("`parent_id` DESC"), - Available_ASC("`available` ASC"), - Available_DESC("`available` DESC"), - Permission_ASC("`permission` ASC"), - Permission_DESC("`permission` DESC"), - ResourceType_ASC("`resource_type` ASC"), - ResourceType_DESC("`resource_type` DESC"), - ModuleColor_ASC("`module_color` ASC"), - ModuleColor_DESC("`module_color` DESC"), - ModuleColorNum_ASC("`module_color_num` ASC"), - ModuleColorNum_DESC("`module_color_num` DESC"), - Url_ASC("`url` ASC"), - Url_DESC("`url` DESC"), - Icon_ASC("`icon` ASC"), - Icon_DESC("`icon` DESC"), - VersionType_ASC("`version_type` ASC"), - VersionType_DESC("`version_type` DESC"), + + ReportTime_ASC("`reportTime` ASC"), + ReportTime_DESC("`reportTime` DESC"), + + TopTime_ASC("`top_time` ASC"), + TopTime_DESC("`top_time` DESC"), + + MerchantId_ASC("`merchant_id` ASC"), + MerchantId_DESC("`merchant_id` DESC"), + + LimitDate_ASC("`limit_date` ASC"), + LimitDate_DESC("`limit_date` DESC"), + Sort_ASC("`sort` ASC"), Sort_DESC("`sort` DESC"), - TenantId_ASC("`tenant_id` ASC"), - TenantId_DESC("`tenant_id` DESC"), - Bucket_ASC("`bucket` ASC"), - Bucket_DESC("`bucket` DESC"), - Key_ASC("`s3_key` ASC"), - Key_DESC("`s3_key` DESC"), - - PermissionId_ASC("`permission_id` ASC"), - PermissionId_DESC("`permission_id` DESC"), - RoleId_ASC("`role_id` ASC"), - RoleId_DESC("`role_id` DESC"), - - Description_ASC("`description` ASC"), - Description_DESC("`description` DESC"), - Type_ASC("`type` ASC"), - Type_DESC("`type` DESC"), + Points_ASC("`points` ASC"), + Points_DESC("`points` DESC"), + Period_ASC("`period` ASC"), Period_DESC("`period` DESC"), - UserId_ASC("`user_id` ASC"), - UserId_DESC("`user_id` DESC"), - Ip_ASC("`ip` ASC"), - Ip_DESC("`ip` DESC"), - ActionDesc_ASC("`action_desc` ASC"), - ActionDesc_DESC("`action_desc` DESC"), - ActionTime_ASC("`action_time` ASC"), - ActionTime_DESC("`action_time` DESC"), - - Username_ASC("`username` ASC"), - Username_DESC("`username` DESC"), - Password_ASC("`password` ASC"), - Password_DESC("`password` DESC"), - LastLoginTime_ASC("`last_login_time` ASC"), - LastLoginTime_DESC("`last_login_time` DESC"), - Status_ASC("`status` ASC"), - Status_DESC("`status` DESC"), - IsAdmin_ASC("`is_admin` ASC"), - IsAdmin_DESC("`is_admin` DESC"), - NickName_ASC("`nick_name` ASC"), - NickName_DESC("`nick_name` DESC"), - Phone_ASC("`phone` ASC"), - Phone_DESC("`phone` DESC"), - BOpenId_ASC("`bopen_id` ASC"), - OpenId_DESC("`bopen_id` DESC"), - WebOpenId_ASC("`web_open_id` ASC"), - WebOpenId_DESC("`web_open_id` DESC"), - - Uid_ASC("`uid` ASC"), - Uid_DESC("`uid` DESC"), - - - CoverImg_ASC("`cover_img` ASC"), - CoverImg_DESC("`cover_img` DESC"), - Title_ASC("`title` ASC"), - Title_DESC("`title` DESC"), - SubTitle_ASC("`sub_title` ASC"), - SubTitle_DESC("`sub_title` DESC"), - StartTime_ASC("`start_time` ASC"), - StartTime_DESC("`start_time` DESC"), - EndTime_ASC("`end_time` ASC"), - EndTime_DESC("`end_time` DESC"), - ActivityTime_ASC("`activity_start_time` ASC"), - ActivityTime_DESC("`activity_start_time` DESC"), - ActionDate_ASC("`action_date` ASC"), - ActionDate_DESC("`action_date` DESC"), - Count_ASC("`count` ASC"), - Count_DESC("`count` DESC"), - AppId_ASC("`app_id` ASC"), - AppId_DESC("`app_id` DESC"), - ParentAppId_ASC("`parent_app_id` ASC"), - ParentAppId_DESC("`parent_app_id` DESC"), - Secret_ASC("`secret` ASC"), - Secret_DESC("`secret` DESC"), - Token_ASC("`token` ASC"), - Token_DESC("`token` DESC"), - AesKey_ASC("`aesKey` ASC"), - AesKey_DESC("`aesKey` DESC"), - MsgDataFormat_ASC("`msg_data_format` ASC"), - MsgDataFormat_DESC("`msg_data_format` DESC"), - AccessToken_ASC("`access_token` ASC"), - AccessToken_DESC("`access_token` DESC"), - LastTokenTime_ASC("`last_token_time` ASC"), - LastTokenTime_DESC("`last_token_time` DESC"), - ExpiresIn_ASC("`expires_in` ASC"), - ExpiresIn_DESC("`expires_in` DESC"), - PayId_ASC("`pay_id` ASC"), - PayId_DESC("`pay_id` DESC"), - AuthorizerAppid_ASC("`authorizer_appid` ASC"), - AuthorizerAppid_DESC("`authorizer_appid` DESC"), - HeadImg_ASC("`head_img` ASC"), - HeadImg_DESC("`head_img` DESC"), - Alias_ASC("`alias` ASC"), - Alias_DESC("`alias` DESC"), - QrcodeUrl_ASC("`qrcode_url` ASC"), - QrcodeUrl_DESC("`qrcode_url` DESC"), - AuthorizationStatus_ASC("`authorization_status` ASC"), - AuthorizationStatus_DESC("`authorization_status` DESC"), - AuthTime_ASC("`auth_time` ASC"), - AuthTime_DESC("`auth_time` DESC"), - BaseStatus_ASC("`base_status` ASC"), - BaseStatus_DESC("`base_status` DESC"), - BaseTime_ASC("`base_time` ASC"), - BaseTime_DESC("`base_time` DESC"), - DomainStatus_ASC("`domain_status` ASC"), - DomainStatus_DESC("`domain_status` DESC"), - DomainTime_ASC("`domain_time` ASC"), - DomainTime_DESC("`domain_time` DESC"), - WebDomainStatus_ASC("`webdomain_status` ASC"), - WebDomainStatus_DESC("`webdomain_status` DESC"), - WebDomainTime_ASC("`webdomain_time` ASC"), - WebDomainTime_DESC("`webdomain_time` DESC"), - TemplateStatus_ASC("`template_status` ASC"), - TemplateStatus_DESC("`template_status` DESC"), - TemplateTime_ASC("`template_time` ASC"), - TemplateTime_DESC("`template_time` DESC"), - AuditBackNum_ASC("`audit_back_num` ASC"), - AuditBackNum_DESC("`audit_back_num` DESC"), - AuditBackTime_ASC("`audit_back_time` ASC"), - AuditBackTime_DESC("`audit_back_time` DESC"), - CurrentVersion_ASC("`current_version` ASC"), - CurrentVersion_DESC("`current_version` DESC"), - CurrentDesc_ASC("`current_desc` ASC"), - CurrentDesc_DESC("`current_desc` DESC"), - ReleaseTime_ASC("`release_time` ASC"), - ReleaseTime_DESC("`release_time` DESC"), - OpenAppId_ASC("`open_appid` ASC"), - OpenAppId_DESC("`open_appid` DESC"), - BindOpenTime_ASC("`bind_open_time` ASC"), - BindOpen_DESC("`bind_open_time` DESC"), - ReceivePay_ASC("`receivePay` ASC"), - ReceivePay_DESC("`receivePay` DESC"), - Pay_ASC("`pay` ASC"), - Pay_DESC("`pay` DESC"), - ReceiveDate_ASC("`receiveDate` ASC"), - ReceiveDate_DESC("`receiveDate` DESC"), - PayDate_ASC("`payDate` ASC"), - PayDate_DESC("`payDate` DESC"), - Createtime_ASC("`createtime` ASC"), - Createtime_DESC("`createtime` DESC"), - ExpiredDay_ASC("`expiredDay` ASC"), - ExpiredDay_DESC("`expiredDay` DESC"), - Owe_ASC("`owe` ASC"), - Owe_DESC("`owe` DESC"), - IsDel_ASC("`isDel` ASC"), - IsDel_DESC("`isDel` DESC"), - MerchantId_ASC("`merchantId` ASC"), - MerchantId_DESC("`merchantId` DESC"), - ShopId_ASC("`shopId` ASC"), - ShopId_DESC("`shopId` DESC"), - Updatetime_ASC("`updatetime` ASC"), - Updatetime_DESC("`updatetime` DESC"), - RentContractId_ASC("`rentContractId` ASC"), - RentContractId_DESC("`rentContractId` DESC"), - NeedPay_ASC("`needPay` ASC"), - NeedPay_DESC("`needPay` DESC"), - UsePrice_ASC("`use_price` ASC"), - UsePrice_DESC("`use_price` DESC"), - DiscountPrice_ASC("`discount_price` ASC"), - DiscountPrice_DESC("`discount_price` DESC"), - Detail_ASC("`detail` ASC"), - Detail_DESC("`detail` DESC"), - ValidStartDate_ASC("`valid_start_date` ASC"), - ValidStartDate_DESC("`valid_start_date` DESC"), - ValidEndDate_ASC("`valid_end_date` ASC"), - ValidEndDate_DESC("`valid_end_date` DESC"), - ImgDetail_ASC("`img_detail` ASC"), - ImgDetail_DESC("`img_detail` DESC"), - CouponIds_ASC("`coupon_ids` ASC"), - CouponIds_DESC("`coupon_ids` DESC"), - MechantId_ASC("`mechant_id` ASC"), - MechantId_DESC("`mechantId` DESC"), - SortNum_ASC("`sort_num` ASC"), - SortNum_DESC("`sortNum` DESC"), - - - - RecordStartTime_ASC("`recordStartTime` ASC"), - RecordStartTime_DESC("`recordStartTime` DESC"), - RecordEndTime_ASC("`recordEndTime` ASC"), - RecordEndTime_DESC("`recordEndTime` DESC"), UsedPower_ASC("`usedPower` ASC"), UsedPower_DESC("`usedPower` DESC"), - TotalEndTime_ASC("`totalPower` ASC"), - TotalEndTime_DESC("`totalPower` DESC"), - ReportTime_ASC("`reportTime` ASC"), - ReportTime_DESC("`reportTime` DESC"), - CreateDate_DESC("`s.create_date` DESC"); + ; private String value; @@ -321,9 +176,6 @@ public class BaseEntity implements Serializable { public String getValue() { return value; } - public void setCol(String value) { - this.value = value; - } @Override public String toString() { return this.getValue(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index 01c54a592..0af49295c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallUserInfo; import com.iformall.enums.EnumMenuType; @@ -165,7 +166,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { } MallPermission mpQ = new MallPermission(); mpQ.setParentId(parentId); - mpQ.setSortColumns(MallPermission.Field.Sort_ASC); + mpQ.setSortColumns(BaseEntity.SortField.Sort_ASC); return mallPermissionMapper.findList(mpQ); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 15e176c0d..153c9b397 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -192,7 +192,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { WxBillProperty record = new WxBillProperty(); record.setPropertyContractId(id); record.setTenantId(tenantId); - record.setSortColumns(WxBillProperty.Field.Id_ASC); + record.setSortColumns(BaseEntity.SortField.Id_ASC); updateBillStatus(record); PageHelper.startPage(pageIndex, pageSize); List billRentList = wxBillPropertyMapper.queryBillPropertyList(record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 4375dafd1..899c7e309 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -7,10 +7,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxBillAction; -import com.iformall.domain.po.WxBillDeposit; -import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillDepositMapper; @@ -194,7 +191,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { WxBillRent record = new WxBillRent(); record.setRentContractId(id); record.setTenantId(tenantId); - record.setSortColumns(WxBillRent.Field.Id_ASC); + record.setSortColumns(BaseEntity.SortField.Id_ASC); updateBillStatus(record); PageHelper.startPage(pageIndex, pageSize); List billRentList = wxBillRentMapper.queryBillRentList(record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index d09964f82..ed4ade030 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -573,7 +573,7 @@ public class WxChartServiceImpl implements WxChartDataService { KwMerchantMeterDataDto kwMerchantMeterDataDto = new KwMerchantMeterDataDto(); kwMerchantMeterDataDto.setStartTime(addMonth(0)); kwMerchantMeterDataDto.setEndTime(addMonth(new Date(),0)); - kwMerchantMeterDataDto.setSortColumns(KwMerchantMeterDataDto.Field.UsedPower_DESC); + kwMerchantMeterDataDto.setSortColumns(BaseEntity.SortField.UsedPower_DESC); kwMerchantMeterDataDto.setMerchantId(0L); kwMerchantMeterDataDto.setLimitCount(10); @@ -2105,7 +2105,7 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getMemberGrowthAnalysis(String tenantId, String startdate, String enddate) { WxLevelConfig wxLevelConfig = new WxLevelConfig(); wxLevelConfig.setTenantId(tenantId); - wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); + wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); List levelList = wxLevelConfigMapper.findList(wxLevelConfig); for (int i = 0; i < levelList.size(); i++) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 8f9686793..bf903a781 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -66,7 +66,7 @@ public class WxCouponServiceImpl implements WxCouponService { @Override public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); - wxCoupon.setSortColumns(WxCoupon.Field.CreateDate_DESC, WxCoupon.Field.Id_DESC); + wxCoupon.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); PageInfo page = null; if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) wxCoupon.setStatus(null); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 9ceddd08b..d1338af57 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.dto.WxCUserBasicInfoDto; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxLevelConfig; import com.iformall.domain.po.WxLevelMerchant; import com.iformall.domain.vo.WxLevelMerchantCVo; @@ -108,7 +109,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { public List getByTenantId(String tenantId) { WxLevelConfig wxLevelConfig = new WxLevelConfig(); wxLevelConfig.setTenantId(tenantId); - wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); + wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); return wxLevelConfigMapper.findList(wxLevelConfig); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 60793f13e..dcb00fb54 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -203,7 +203,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxLevelConfig wxLevelConfig = new WxLevelConfig(); wxLevelConfig.setTenantId(wxMerchant.getTenantId()); - wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); + wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); wxMerchant.setLevelConfigList(wxLevelConfigService.listByMerchantId(wxMerchant.getId(),wxLevelConfig)); return wxMerchant; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java index 919b694da..e2ceea8d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; import com.iformall.common.IdWorker; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMsgLimit; import com.iformall.enums.EnumMsgLimitType; import com.iformall.mapper.WxMsgLimitMapper; @@ -93,7 +94,7 @@ public class WxMsgLimitServiceImpl implements WxMsgLimitService { if(record.getExpireDate() == null) { record.setExpireDate(new Date()); } - record.setSortColumns(WxMsgLimit.Field.LimitDate_DESC, WxMsgLimit.Field.Id_DESC); + record.setSortColumns(BaseEntity.SortField.LimitDate_DESC, BaseEntity.SortField.Id_DESC); List list = wxMsgLimitMapper.findList(record); if(list.size() > 0) { // 已有限制条件 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 70cdf9382..2115ed210 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -205,7 +205,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService public List getWxBillPropertyPreview(Long id) { WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setPropertyContractId(id); - wxBillRent.setSortColumns(WxBillProperty.Field.Period_ASC); + wxBillRent.setSortColumns(BaseEntity.SortField.Period_ASC); return wxBillPropertyMapper.findList(wxBillRent); } @@ -352,7 +352,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //查询预账单用于展示 WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setPropertyContractId(record.getId()); - wxBillRent.setSortColumns(WxBillProperty.Field.Period_ASC); + wxBillRent.setSortColumns(BaseEntity.SortField.Period_ASC); wxBillRent.setIsPreview(EnumIsPreview.YES.getCode()); List billList = wxBillPropertyMapper.findList(wxBillRent); record.setPreviewBillRentList(billList); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index beb6a92ec..bbbb32e6e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -241,7 +241,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //查询预账单用于展示 WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setRentContractId(id); - wxBillRent.setSortColumns(WxBillRent.Field.Period_ASC); + wxBillRent.setSortColumns(BaseEntity.SortField.Period_ASC); List resultList = wxBillRentMapper.findList(wxBillRent); result.put("previewBillRentList",resultList); @@ -395,7 +395,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //查询预账单用于展示 WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setRentContractId(record.getId()); - wxBillRent.setSortColumns(WxBillRent.Field.Period_ASC); + wxBillRent.setSortColumns(BaseEntity.SortField.Period_ASC); wxBillRent.setIsPreview(EnumIsPreview.YES.getCode()); List resultList = wxBillRentMapper.findList(wxBillRent); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java index 93aa77688..88aff92e9 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.KwMeterDataDto; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.KwMeterData; import com.iformall.domain.vo.KwMeterDataVo; import com.iformall.enums.EnumMeterStatus; @@ -34,7 +35,7 @@ public class KwMeterDataServiceImpl implements KwMeterDataService { @Override public PageInfo listVoAsPage(KwMeterDataDto kwMeterDataDto, Integer pageIndex, Integer pageSize) { if (kwMeterDataDto.getSortColumn() == null) - kwMeterDataDto.setSortColumns(KwMeterDataDto.Field.ReportTime_DESC); + kwMeterDataDto.setSortColumns(BaseEntity.SortField.ReportTime_DESC); kwMeterDataDto.setStatus(EnumMeterStatus.VALID.getCode()); return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMeterDataMapper.findVoList(kwMeterDataDto)); } @@ -42,7 +43,7 @@ public class KwMeterDataServiceImpl implements KwMeterDataService { @Override public List findVoList(KwMeterDataDto kwMeterDataDto) { if (kwMeterDataDto.getSortColumn() == null && kwMeterDataDto.getSortColumns() == null) - kwMeterDataDto.setSortColumns(KwMeterDataDto.Field.ReportTime_ASC); + kwMeterDataDto.setSortColumns(BaseEntity.SortField.ReportTime_ASC); kwMeterDataDto.setStatus(EnumMeterStatus.VALID.getCode()); return kwMeterDataMapper.findVoList(kwMeterDataDto); }