From 9557362cf060bf9cb391c9840a0a060b4a4e674f Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 7 May 2019 17:17:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=B6=E7=BC=B4=E7=8E=87=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94=E7=B2=BE=E5=BA=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/dto/WxOrderReportDto.java | 6 ++++++ .../java/com/iformall/domain/po/WxBillDaily.java | 15 +++++++-------- .../java/com/iformall/domain/po/WxBillOther.java | 9 ++++----- .../iformall/domain/po/WxBillOtherDeposit.java | 8 ++++---- .../com/iformall/domain/po/WxBillProperty.java | 6 +++++- .../java/com/iformall/domain/po/WxBillRent.java | 6 +++++- .../main/java/com/iformall/domain/po/WxBrand.java | 6 +++++- .../com/iformall/domain/po/WxMerchantSubsidy.java | 10 ++++++---- .../main/java/com/iformall/domain/po/WxOrder.java | 12 ++++++------ .../iformall/domain/po/WxPropertyContract.java | 6 +++++- .../com/iformall/domain/po/WxRentContract.java | 6 +++++- .../main/java/com/iformall/domain/po/WxShop.java | 9 ++++++++- .../java/com/iformall/domain/vo/WxBillAll.java | 6 +++++- .../domain/vo/WxMerchantTradeDailyVo.java | 6 +++++- .../com/iformall/domain/vo/WxOrderQueryVo.java | 9 ++++++++- .../domain/vo/WxProfitSharingOrderQueryVo.java | 10 ++++++++-- .../service/impl/WxBillDailyServiceImpl.java | 1 - .../iformall/service/impl/WxChartServiceImpl.java | 5 +++++ .../main/resources/mapper/WxBillDailyMapper.xml | 4 +++- .../resources/mapper/WxBillOtherDepositMapper.xml | 3 ++- .../main/resources/mapper/WxBillOtherMapper.xml | 4 +++- .../src/main/resources/mapper/WxOrderMapper.xml | 5 ++++- .../mapper/WxProfitSharingOrderMapper.xml | 4 +++- .../src/main/resources/mapper/WxShopMapper.xml | 4 ++-- 24 files changed, 114 insertions(+), 46 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java index 1c10d2def..127805bed 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java @@ -17,4 +17,10 @@ public class WxOrderReportDto extends BaseEntity{ private Date endTime; private Integer type; private Integer orderStatus; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 0dba5f0a5..d86c2f317 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -12,9 +12,7 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_daily") -public class WxBillDaily implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxBillDaily extends BaseEntity{ @Id protected Long id; @@ -29,17 +27,18 @@ public class WxBillDaily implements Serializable { public void setId(Long id) { this.id = id; } - public String getSortColumns() { - return sortColumns; - } - + public List getIds() { return ids; } public void setIds(List ids) { this.ids = ids; } - + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } @Transient private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index eff3d3140..ad875fdcb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -12,9 +12,7 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_other") -public class WxBillOther implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxBillOther extends BaseEntity { @Id protected Long id; @@ -29,10 +27,11 @@ public class WxBillOther implements Serializable { public void setId(Long id) { this.id = id; } + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } - public List getIds() { return ids; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 97437e4fc..928eb801b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -12,9 +12,7 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_other_deposit") -public class WxBillOtherDeposit implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxBillOtherDeposit extends BaseEntity { @Id protected Long id; @@ -31,8 +29,10 @@ public class WxBillOtherDeposit implements Serializable { this.id = id; } + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } public List getIds() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index f8de2a5dd..c956a3bff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -21,7 +21,11 @@ public class WxBillProperty extends BaseEntity { protected List ids; @Transient protected String sortColumns; - + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } public Long getId() { return id; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 5e21be0ba..a28479bb4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -21,7 +21,11 @@ public class WxBillRent extends BaseEntity { protected List ids; @Transient protected String sortColumns; - + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } public Long getId() { return id; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java index 8fd4f64a3..0f39a9882 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java @@ -19,7 +19,11 @@ public class WxBrand extends BaseEntity{ protected List ids; @Transient protected String sortColumns; - + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } public Long getId() { return id; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 759685ec8..e3f5cec1e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -12,10 +12,7 @@ import java.io.Serializable; @Table(name = "wx_merchant_subsidy") @Data -public class WxMerchantSubsidy implements Serializable { - private static final long serialVersionUID = 1L; - - +public class WxMerchantSubsidy extends BaseEntity { @Id protected Long id; @@ -28,6 +25,11 @@ public class WxMerchantSubsidy implements Serializable { @Transient protected String sortColumns; + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 6bf6c37a0..7748a9e2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -8,9 +8,7 @@ import java.util.Date; import java.util.List; @Table(name = "wx_order") -public class WxOrder implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxOrder extends BaseEntity { @Id protected Long id; @@ -26,11 +24,13 @@ public class WxOrder implements Serializable { public void setId(Long id) { this.id = id; } - + + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } - + public List getIds() { return ids; } 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 a132fb3f5..9f60ba4c8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -27,7 +27,11 @@ public class WxPropertyContract extends BaseEntity { protected List ids; @Transient protected String sortColumns; - + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } public Long getId() { return id; } 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 389bab0cf..efee2aa5d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -21,7 +21,11 @@ public class WxRentContract extends BaseEntity { protected List ids; @Transient protected String sortColumns; - + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } public Long getId() { return id; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 4725e3765..c4b82b8c8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -1,6 +1,8 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.iformall.common.SortColumn; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -40,7 +42,11 @@ public class WxShop extends BaseEntity { @Transient private String linkPhone; - + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @@ -57,6 +63,7 @@ public class WxShop extends BaseEntity { /*建筑面积**/ @io.swagger.annotations.ApiModelProperty(value="建筑面积",name="buildArea") @Excel(name="建筑面积(㎡)",width = 20,orderNum = "5") + @SortColumn(column = "buildArea") private String buildArea; /*经营面积**/ @io.swagger.annotations.ApiModelProperty(value="经营面积",name="operationArea") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 25fcc17a7..234be8a32 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -7,7 +7,11 @@ import java.util.List; * @author gongbiao */ public class WxBillAll extends BaseEntity { - + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } @io.swagger.annotations.ApiModelProperty(value="appId",name="appId") private String appId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index e5b1ca475..e2f5485cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -14,7 +14,11 @@ public class WxMerchantTradeDailyVo extends BaseEntity { protected List ids; @Transient protected String sortColumns; - + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } public Long getId() { return id; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java index a18c1d0cd..08add70f9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java @@ -1,12 +1,14 @@ package com.iformall.domain.vo; +import com.iformall.domain.po.BaseEntity; + import java.io.Serializable; import java.util.Date; /** * @author gongbiao */ -public class WxOrderQueryVo implements Serializable { +public class WxOrderQueryVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") private String tenantId; @@ -22,6 +24,11 @@ public class WxOrderQueryVo implements Serializable { private Integer payment; + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } public String getTenantId() { return tenantId; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java index 5b62e92e3..0b3678c1e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java @@ -1,12 +1,12 @@ package com.iformall.domain.vo; -import java.io.Serializable; +import com.iformall.domain.po.BaseEntity; import java.util.Date; /** * @author gongbiao */ -public class WxProfitSharingOrderQueryVo implements Serializable { +public class WxProfitSharingOrderQueryVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") private String tenantId; @@ -23,6 +23,12 @@ public class WxProfitSharingOrderQueryVo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") private Date enddate; + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + public Long getId() { return id; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index a0ded9d42..d1f6aadc2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -178,7 +178,6 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { } } - @Override public void deleteById(Long id) { wxBillDailyMapper.deleteByPrimaryKey(id); 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 b36125825..a418ad54b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2309,12 +2309,17 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("total",total); datamap.put("totalShop",totalShop); datamap.put("totalPoint",totalPoint); + datamap.put("rentTotal",rentTotal); datamap.put("rentTotalShop",rentTotalShop); datamap.put("rentTotalPoint",rentTotalPoint); + datamap.put("notRentTotal",notRentTotal); datamap.put("notRentTotalShop",notRentTotalShop); datamap.put("notRentTotalPoint",notRentTotalPoint); + + double totalRentRate = rentTotal/total*100; +// datamap.put("totalPoint",su); return new ResultData(datamap); } diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 5db67623c..335e4a775 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -83,7 +83,9 @@ and br.`pay_way` = #{payWay} - order by id desc + + order by ${sortColumns} + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 047c58195..67e96ec4c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -89,7 +89,8 @@ and br.`pay_way` = #{payWay} - order by id desc + order by ${sortColumns} + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 53468e9cb..c98766c23 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -84,7 +84,9 @@ and br.`pay_way` = #{payWay} - order by id desc + + order by ${sortColumns} + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index eb8f134b1..eb44b0d86 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -559,7 +559,10 @@ and o.create_date between #{startdate} and #{enddate} - order by o.id desc + + order by ${sortColumns} + order by o.id desc + diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index 5a9a85398..93f7ef3f8 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -148,7 +148,9 @@ and pso.create_time between #{startdate} and #{enddate} - order by pso.id desc + + order by ${sortColumns} + order by pso.id desc