From efc1e83a9564d136fcdbbff27c4528529457222e Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 29 Jul 2019 14:21:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BB=9E=E7=BA=B3=E9=87=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/rent/WxBillActionController.java | 8 ++++++++ .../java/com/iformall/domain/po/WxPropertyContract.java | 2 +- .../main/java/com/iformall/domain/po/WxRentContract.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java index b65743185..ea2fe8d22 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java @@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxBillAction; import com.iformall.service.WxBillActionService; +import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -14,6 +15,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.apache.commons.collections.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -59,7 +61,13 @@ public class WxBillActionController extends BaseController { wxBillAction.setTenantId(getTenantId()); wxBillAction.setSortColumns(BaseEntity.SortField.Id_DESC); PageInfo result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); + if(result != null && CollectionUtils.isNotEmpty(result.getList())){ +// DateUtils.getDaySet() +// for (WxBillAction action:result.getList()) { +// +// } + } return new ResultData(result); } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index ef778108d..667cc5c2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -142,7 +142,7 @@ public class WxPropertyContract extends BaseEntity { private String adjustRatio; @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayDay") - private Integer latePayDay; + private String latePayDay; @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") private Integer latePayRatio; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 56b638156..f73c066d4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -227,7 +227,7 @@ public class WxRentContract extends BaseEntity { private Integer operationType; @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") - private Integer latePayRatio; + private String latePayRatio; @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") private Integer latePayDay;