Explorar el Código

[po][修改]:po修改

release_toaliyun_real
Stormeye Wu hace 6 años
padre
commit
88bf55f93c
Se han modificado 2 ficheros con 5 adiciones y 4 borrados
  1. +2
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java

+ 2
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java Ver fichero

@@ -2,10 +2,10 @@ package com.iformall.controller;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxDateAmountRecord; import com.iformall.domain.po.WxDateAmountRecord;
import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.vo.AmountRecordVo; import com.iformall.domain.vo.AmountRecordVo;
import com.iformall.enums.EnumCouponOrderStatus;
import com.iformall.enums.EnumDateAmtType; import com.iformall.enums.EnumDateAmtType;
import com.iformall.service.WxDateAmountRecordService; import com.iformall.service.WxDateAmountRecordService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;


import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;


@@ -60,7 +59,7 @@ public class WxDateAmountRecordController extends BaseController {
temp.setTenantId(u.getTenantId()); temp.setTenantId(u.getTenantId());
temp.setMerchantId(u.getMerchantId()); temp.setMerchantId(u.getMerchantId());
temp.setType(dateAmtType); temp.setType(dateAmtType);
temp.setSortColumns(WxDateAmountRecord.Field.Date_DESC);
temp.setSortColumns(BaseEntity.SortField.Date_DESC);


SimpleDateFormat fmt = new SimpleDateFormat("MM/dd"); SimpleDateFormat fmt = new SimpleDateFormat("MM/dd");




+ 3
- 1
mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java Ver fichero

@@ -91,7 +91,6 @@ public class BaseEntity implements Serializable {
return result.toString(); return result.toString();
} }



public void setSortColumns(SortField... fields) public void setSortColumns(SortField... fields)
{ {
if (fields == null || fields.length == 0) { if (fields == null || fields.length == 0) {
@@ -156,6 +155,9 @@ public class BaseEntity implements Serializable {


UsedPower_ASC("`usedPower` ASC"), UsedPower_ASC("`usedPower` ASC"),
UsedPower_DESC("`usedPower` DESC"), UsedPower_DESC("`usedPower` DESC"),

Date_ASC("`date` ASC"),
Date_DESC("`date` DESC"),
; ;
private String value; private String value;


Cargando…
Cancelar
Guardar