Просмотр исходного кода

[重要][重要]:调整基础数据类的排序,编不过!!!

release_toaliyun_real
hupeng 6 лет назад
Родитель
Сommit
c4f1b4be4e
40 измененных файлов: 49 добавлений и 855 удалений
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java
  3. +1
    -40
      mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java
  4. +0
    -5
      mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java
  5. +0
    -5
      mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java
  6. +25
    -2
      mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java
  7. +0
    -40
      mallinkService/src/main/java/com/iformall/domain/po/KwBox.java
  8. +0
    -40
      mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java
  9. +0
    -42
      mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
  10. +0
    -39
      mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java
  11. +0
    -42
      mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java
  12. +0
    -42
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java
  13. +0
    -38
      mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java
  14. +0
    -41
      mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java
  15. +2
    -43
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  16. +0
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  17. +0
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java
  18. +0
    -39
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  19. +0
    -45
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
  20. +0
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java
  21. +0
    -42
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
  22. +0
    -38
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  23. +1
    -35
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  24. +0
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java
  25. +0
    -45
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java
  26. +0
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  27. +0
    -44
      mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java
  28. +2
    -41
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
  29. +0
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java
  30. +0
    -5
      mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java
  31. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterDataVo.java
  32. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java
  33. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java
  34. +1
    -5
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java
  35. +1
    -39
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java
  36. +0
    -5
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java
  37. +0
    -5
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java
  38. +1
    -5
      mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java
  39. +1
    -1
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java
  40. +3
    -1
      mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml

+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java Просмотреть файл

@@ -1,7 +1,9 @@
package com.iformall.domain.dto; package com.iformall.domain.dto;


import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxBillProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@@ -11,6 +13,7 @@ import java.util.List;
* @author gongbiao * @author gongbiao
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
public class KwMerchantMeterDataDto extends KwMeterDataDto { public class KwMerchantMeterDataDto extends KwMeterDataDto {


@io.swagger.annotations.ApiModelProperty(value="状态1使用0停用",name="merchantStatus") @io.swagger.annotations.ApiModelProperty(value="状态1使用0停用",name="merchantStatus")
@@ -24,4 +27,5 @@ public class KwMerchantMeterDataDto extends KwMeterDataDto {


@io.swagger.annotations.ApiModelProperty(value = "获取个数", name = "limitCount") @io.swagger.annotations.ApiModelProperty(value = "获取个数", name = "limitCount")
private Integer limitCount; private Integer limitCount;

} }

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.domain.dto;


import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@@ -11,6 +12,7 @@ import java.util.List;
* @author gongbiao * @author gongbiao
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
public class KwMerchantMeterDto extends BaseEntity { public class KwMerchantMeterDto extends BaseEntity {


private String tenantId; private String tenantId;


+ 1
- 40
mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java Просмотреть файл

@@ -17,17 +17,9 @@ import java.util.List;
* @author gongbiao * @author gongbiao
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
public class KwMeterDataDto extends BaseEntity { public class KwMeterDataDto extends BaseEntity {



protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;


@@ -91,36 +83,5 @@ public class KwMeterDataDto extends BaseEntity {
} }
} }


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(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 5
mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java Просмотреть файл

@@ -41,9 +41,4 @@ public class MarkingCouponDataReportDto extends BaseEntity {
@SortColumn(column = "xTime") @SortColumn(column = "xTime")
private String xtime; private String xtime;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
} }

+ 0
- 5
mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java Просмотреть файл

@@ -22,9 +22,4 @@ public class WxOrderReportDto extends BaseEntity {
private Integer type; private Integer type;
private Integer orderStatus; private Integer orderStatus;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
} }

+ 25
- 2
mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java Просмотреть файл

@@ -1,12 +1,15 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.iformall.common.SortColumn; import com.iformall.common.SortColumn;
import com.iformall.domain.dto.KwMeterDataDto;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;


/** /**
* @author luozukai * @author luozukai
@@ -19,11 +22,13 @@ public class BaseEntity implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Transient @Transient
private String sortColumn; private String sortColumn;

@Transient @Transient
private String sortOrder; private String sortOrder;


@Transient @Transient
public String sortColumns;
private String sortColumns;



public String getSortColumns() { public String getSortColumns() {
if(StringUtils.isBlank(sortColumn)){ if(StringUtils.isBlank(sortColumn)){
@@ -71,7 +76,7 @@ public class BaseEntity implements Serializable {
* @param camelCaseName * @param camelCaseName
* @return * @return
*/ */
public static String underscoreName(String camelCaseName) {
private static String underscoreName(String camelCaseName) {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
if (camelCaseName != null && camelCaseName.length() > 0) { if (camelCaseName != null && camelCaseName.length() > 0) {
result.append(camelCaseName.substring(0, 1).toLowerCase()); result.append(camelCaseName.substring(0, 1).toLowerCase());
@@ -87,4 +92,22 @@ public class BaseEntity implements Serializable {
} }
return result.toString(); 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());
}
sortColumns = sb.toString();
}

} }

+ 0
- 40
mallinkService/src/main/java/com/iformall/domain/po/KwBox.java Просмотреть файл

@@ -23,14 +23,6 @@ public class KwBox extends BaseEntity {
protected Long id; protected Long id;
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;
@@ -110,36 +102,4 @@ public class KwBox extends BaseEntity {
} }
} }


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(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 40
mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java Просмотреть файл

@@ -23,14 +23,6 @@ public class KwBoxCmdHistory extends BaseEntity {
protected Long id; protected Long id;
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;
@@ -79,36 +71,4 @@ public class KwBoxCmdHistory extends BaseEntity {
} }
} }


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(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 42
mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java Просмотреть файл

@@ -24,14 +24,6 @@ public class KwMeter extends BaseEntity {
protected Long id; protected Long id;
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;
@@ -101,7 +93,6 @@ public class KwMeter extends BaseEntity {
protected KwMeterData latestRecord; protected KwMeterData latestRecord;





public static enum Field { public static enum Field {
Id_ASC("`id` ASC"), Id_ASC("`id` ASC"),
Id_DESC("`id` DESC"), Id_DESC("`id` DESC"),
@@ -128,37 +119,4 @@ public class KwMeter extends BaseEntity {
return this.getValue(); return this.getValue();
} }
} }

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(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 39
mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java Просмотреть файл

@@ -27,14 +27,7 @@ public class KwMeterData extends BaseEntity {
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId; private String tenantId;
@@ -93,36 +86,4 @@ public class KwMeterData extends BaseEntity {
} }
} }


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(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 42
mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java Просмотреть файл

@@ -19,8 +19,6 @@ public class MallUserAction extends BaseEntity {
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@@ -62,45 +60,5 @@ public class MallUserAction extends BaseEntity {
return this.getValue(); return this.getValue();
} }
} }
public void setSortColumns(MallUserAction.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(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
} }

+ 0
- 42
mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java Просмотреть файл

@@ -28,14 +28,6 @@ public class MallUserInfo extends BaseEntity {
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@@ -161,39 +153,5 @@ public class MallUserInfo extends BaseEntity {
return this.getValue(); return this.getValue();
} }
} }
public void setSortColumns(MallUserInfo.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(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 38
mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java Просмотреть файл

@@ -24,14 +24,7 @@ public class WxActivity extends BaseEntity {


@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId")
private String tenantId; private String tenantId;
@@ -149,37 +142,6 @@ public class WxActivity extends BaseEntity {
} }
} }


public void setSortColumns(WxActivity.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(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }



+ 0
- 41
mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java Просмотреть файл

@@ -25,14 +25,6 @@ public class WxActivityJoin extends BaseEntity {


@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId")
private String tenantId; private String tenantId;
@@ -111,37 +103,4 @@ public class WxActivityJoin extends BaseEntity {
} }
} }


public void setSortColumns(WxActivityJoin.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();
}

@Override
public void setSortColumns(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 2
- 43
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java Просмотреть файл

@@ -25,16 +25,10 @@ import java.util.Map;
public class WxBillDaily extends BaseEntity{ public class WxBillDaily extends BaseEntity{
@Id @Id
protected Long id; protected Long id;
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;
@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@Transient @Transient
private String merchantName; private String merchantName;


@@ -147,39 +141,4 @@ public class WxBillDaily extends BaseEntity{
return this.getValue(); return this.getValue();
} }
} }
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());
}
}
public void setSortColumns(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 8
mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java Просмотреть файл

@@ -25,14 +25,6 @@ public class WxCUserBasicInfo extends BaseEntity {
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@Excel(name="姓名",width = 20,orderNum = "1") @Excel(name="姓名",width = 20,orderNum = "1")
@NotNull @NotNull


+ 0
- 5
mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java Просмотреть файл

@@ -62,9 +62,4 @@ public class WxCarPayRecord extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay") @io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay")
private Integer isPay; private Integer isPay;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
} }

+ 0
- 39
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Просмотреть файл

@@ -37,12 +37,6 @@ public class WxCoupon extends BaseEntity {
@Transient @Transient
protected String channels; protected String channels;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@Transient @Transient
@SortColumn(column = "sale_price") @SortColumn(column = "sale_price")
private String salePriceStr; private String salePriceStr;
@@ -321,38 +315,5 @@ public class WxCoupon extends BaseEntity {
} }
} }


public void setSortColumns(WxCoupon.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(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 45
mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java Просмотреть файл

@@ -23,15 +23,6 @@ public class WxCouponChannel extends BaseEntity {
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;


@Transient
protected String sortColumns;

@Override
public String getSortColumns(){
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@Transient @Transient
private Date startdate; private Date startdate;


@@ -150,40 +141,4 @@ public class WxCouponChannel extends BaseEntity {
} }
} }


public void setSortColumns(WxCouponChannel.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(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 7
mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java Просмотреть файл

@@ -22,8 +22,6 @@ public class WxCouponInject extends BaseEntity {


@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;


@Transient @Transient
protected WxMsgModel msgModel; protected WxMsgModel msgModel;
@@ -34,11 +32,6 @@ public class WxCouponInject extends BaseEntity {
@Transient @Transient
protected Date sendTimeEnd; protected Date sendTimeEnd;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value="",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="",name="tenantId")
private String tenantId; private String tenantId;


+ 0
- 42
mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java Просмотреть файл

@@ -22,14 +22,6 @@ public class WxCouponOrder extends BaseEntity{


@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId")
private String tenantId; private String tenantId;
@@ -134,40 +126,6 @@ public class WxCouponOrder extends BaseEntity{
} }
} }


public void setSortColumns(WxCouponOrder.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(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}

public Long getcUserId() { public Long getcUserId() {
return cUserId; return cUserId;
} }


+ 0
- 38
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -23,8 +23,6 @@ public class WxMerchant extends BaseEntity {
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;


@Transient @Transient
private List<Long> userids; private List<Long> userids;
@@ -234,40 +232,4 @@ public class WxMerchant extends BaseEntity {
return this.getValue(); return this.getValue();
} }
} }
public void setSortColumns(WxMerchant.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(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 1
- 35
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java Просмотреть файл

@@ -167,39 +167,5 @@ public class WxMerchantSubsidy extends BaseEntity {
return this.getValue(); return this.getValue();
} }
} }
public void setSortColumns(WxMerchantSubsidy.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(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}

} }

+ 0
- 8
mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java Просмотреть файл

@@ -21,14 +21,6 @@ public class WxMsgModel extends BaseEntity {
@Transient @Transient
protected List<String> ids; protected List<String> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;


+ 0
- 45
mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java Просмотреть файл

@@ -22,14 +22,6 @@ public class WxMsgSignature extends BaseEntity {
@Transient @Transient
protected List<String> ids; protected List<String> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@@ -61,41 +53,4 @@ public class WxMsgSignature extends BaseEntity {
return this.getValue(); return this.getValue();
} }
} }
public void setSortColumns(WxMsgSignature.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(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 8
mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java Просмотреть файл

@@ -22,14 +22,6 @@ public class WxOrder extends BaseEntity {
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@Transient @Transient
private String merchantName; private String merchantName;


+ 0
- 44
mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java Просмотреть файл

@@ -23,14 +23,6 @@ public class WxScreenAd extends BaseEntity {


@Transient @Transient
protected List<Long> ids; protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


@io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId")
private String tenantId; private String tenantId;
@@ -88,40 +80,4 @@ public class WxScreenAd extends BaseEntity {
} }
} }


public void setSortColumns(WxScreenAd.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(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 2
- 41
mallinkService/src/main/java/com/iformall/domain/po/WxShop.java Просмотреть файл

@@ -32,12 +32,7 @@ public class WxShop extends BaseEntity {


@Transient @Transient
private String linkPhone; private String linkPhone;
@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;


@@ -158,39 +153,5 @@ public class WxShop extends BaseEntity {
return this.getValue(); return this.getValue();
} }
} }
public void setSortColumns(WxShop.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());
}
sortColumns=sb.toString();
}
public void setSortColumns(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}

} }

+ 0
- 5
mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java Просмотреть файл

@@ -81,11 +81,6 @@ public class WxTopic extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene")
private String weappScene; private String weappScene;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


public String getWeappPath() { public String getWeappPath() {
if(id == null) if(id == null)


+ 0
- 5
mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java Просмотреть файл

@@ -49,9 +49,4 @@ public class BaseMsg extends BaseEntity {
@Transient @Transient
private Integer delayTimeLevel = 0; private Integer delayTimeLevel = 0;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
} }

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterDataVo.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.domain.vo;


import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;


import java.util.Date; import java.util.Date;


@@ -9,6 +10,7 @@ import java.util.Date;
* @author gongbiao * @author gongbiao
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
public class KwMerchantMeterDataVo extends KwMeterDataVo { public class KwMerchantMeterDataVo extends KwMeterDataVo {


@io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId")


+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java Просмотреть файл

@@ -3,6 +3,7 @@ package com.iformall.domain.vo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.iformall.domain.po.KwMeter; import com.iformall.domain.po.KwMeter;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;


import java.util.List; import java.util.List;




+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.domain.vo;


import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@@ -11,6 +12,7 @@ import java.util.List;
* @author gongbiao * @author gongbiao
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
public class KwMeterDataVo extends BaseEntity { public class KwMeterDataVo extends BaseEntity {


@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")


+ 1
- 5
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java Просмотреть файл

@@ -16,11 +16,7 @@ import java.util.List;
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxBillAll extends BaseEntity { public class WxBillAll extends BaseEntity {
@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@io.swagger.annotations.ApiModelProperty(value="appId",name="appId") @io.swagger.annotations.ApiModelProperty(value="appId",name="appId")
private String appId; private String appId;




+ 1
- 39
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java Просмотреть файл

@@ -22,13 +22,7 @@ public class WxMerchantTradeDailyVo extends BaseEntity {


@Transient @Transient
protected List<String> ids; protected List<String> ids;
@Transient
protected String sortColumns;
@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}



@io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId")
private String tenantId; private String tenantId;
@@ -127,36 +121,4 @@ public class WxMerchantTradeDailyVo extends BaseEntity {
} }
} }


public void setSortColumns(WxMerchantTradeDailyVo.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(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
} }

+ 0
- 5
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java Просмотреть файл

@@ -24,10 +24,5 @@ public class WxOrderGroupMarketing extends BaseEntity {
private String verifyRatio; private String verifyRatio;
private String totalPeople; private String totalPeople;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}


} }

+ 0
- 5
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java Просмотреть файл

@@ -36,9 +36,4 @@ public class WxOrderQueryVo extends BaseEntity {
@Transient @Transient
private Date createDate; private Date createDate;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
} }

+ 1
- 5
mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java Просмотреть файл

@@ -41,9 +41,5 @@ public class WxProfitSharingOrderQueryVo extends BaseEntity {
@javax.persistence.Transient @javax.persistence.Transient
private Date createTime; private Date createTime;


@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java Просмотреть файл

@@ -41,7 +41,7 @@ public class KwMeterDataServiceImpl implements KwMeterDataService {


@Override @Override
public List<KwMeterDataVo> findVoList(KwMeterDataDto kwMeterDataDto) { public List<KwMeterDataVo> findVoList(KwMeterDataDto kwMeterDataDto) {
if (kwMeterDataDto.getSortColumn() == null)
if (kwMeterDataDto.getSortColumn() == null && kwMeterDataDto.getSortColumns() == null)
kwMeterDataDto.setSortColumns(KwMeterDataDto.Field.ReportTime_ASC); kwMeterDataDto.setSortColumns(KwMeterDataDto.Field.ReportTime_ASC);
kwMeterDataDto.setStatus(EnumMeterStatus.VALID.getCode()); kwMeterDataDto.setStatus(EnumMeterStatus.VALID.getCode());
return kwMeterDataMapper.findVoList(kwMeterDataDto); return kwMeterDataMapper.findVoList(kwMeterDataDto);


+ 3
- 1
mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml Просмотреть файл

@@ -232,8 +232,10 @@
<if test=" null != businessId "> <if test=" null != businessId ">
,businessId ,businessId
</if> </if>
<if test=" null != limitCount">limit #{limitCount}</if>
<if test=" null != sortColumns">order by ${sortColumns}</if> <if test=" null != sortColumns">order by ${sortColumns}</if>

<if test=" null != limitCount">limit #{limitCount}</if>
</select> </select>






Загрузка…
Отмена
Сохранить