| @@ -17,4 +17,10 @@ public class WxOrderReportDto extends BaseEntity{ | |||||
| private Date endTime; | private Date endTime; | ||||
| private Integer type; | private Integer type; | ||||
| private Integer orderStatus; | private Integer orderStatus; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| } | } | ||||
| @@ -12,9 +12,7 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_bill_daily") | @Table(name = "wx_bill_daily") | ||||
| public class WxBillDaily implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxBillDaily extends BaseEntity{ | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -29,17 +27,18 @@ public class WxBillDaily implements Serializable { | |||||
| public void setId(Long id) { | public void setId(Long id) { | ||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| public void setIds(List<Long> ids) { | public void setIds(List<Long> ids) { | ||||
| this.ids = ids; | this.ids = ids; | ||||
| } | } | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| @Transient | @Transient | ||||
| private String merchantName; | private String merchantName; | ||||
| @@ -12,9 +12,7 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_bill_other") | @Table(name = "wx_bill_other") | ||||
| public class WxBillOther implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxBillOther extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -29,10 +27,11 @@ public class WxBillOther implements Serializable { | |||||
| public void setId(Long id) { | public void setId(Long id) { | ||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| @Override | |||||
| public String getSortColumns() { | public String getSortColumns() { | ||||
| return sortColumns; | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | } | ||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| @@ -12,9 +12,7 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_bill_other_deposit") | @Table(name = "wx_bill_other_deposit") | ||||
| public class WxBillOtherDeposit implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxBillOtherDeposit extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -31,8 +29,10 @@ public class WxBillOtherDeposit implements Serializable { | |||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| @Override | |||||
| public String getSortColumns() { | public String getSortColumns() { | ||||
| return sortColumns; | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | } | ||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| @@ -21,7 +21,11 @@ public class WxBillProperty extends BaseEntity { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| public Long getId() { | public Long getId() { | ||||
| return id; | return id; | ||||
| } | } | ||||
| @@ -21,7 +21,11 @@ public class WxBillRent extends BaseEntity { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| public Long getId() { | public Long getId() { | ||||
| return id; | return id; | ||||
| } | } | ||||
| @@ -19,7 +19,11 @@ public class WxBrand extends BaseEntity{ | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| public Long getId() { | public Long getId() { | ||||
| return id; | return id; | ||||
| } | } | ||||
| @@ -12,10 +12,7 @@ import java.io.Serializable; | |||||
| @Table(name = "wx_merchant_subsidy") | @Table(name = "wx_merchant_subsidy") | ||||
| @Data | @Data | ||||
| public class WxMerchantSubsidy implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxMerchantSubsidy extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -28,6 +25,11 @@ public class WxMerchantSubsidy implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| /**租户ID**/ | /**租户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -8,9 +8,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_order") | @Table(name = "wx_order") | ||||
| public class WxOrder implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxOrder extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -26,11 +24,13 @@ public class WxOrder implements Serializable { | |||||
| public void setId(Long id) { | public void setId(Long id) { | ||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| @Override | |||||
| public String getSortColumns() { | public String getSortColumns() { | ||||
| return sortColumns; | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | } | ||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| @@ -27,7 +27,11 @@ public class WxPropertyContract extends BaseEntity { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| public Long getId() { | public Long getId() { | ||||
| return id; | return id; | ||||
| } | } | ||||
| @@ -21,7 +21,11 @@ public class WxRentContract extends BaseEntity { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| public Long getId() { | public Long getId() { | ||||
| return id; | return id; | ||||
| } | } | ||||
| @@ -1,6 +1,8 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | import cn.afterturn.easypoi.excel.annotation.Excel; | ||||
| import com.iformall.common.SortColumn; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -40,7 +42,11 @@ public class WxShop extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private String linkPhone; | private String linkPhone; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| /*租户ID**/ | /*租户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| @@ -57,6 +63,7 @@ public class WxShop extends BaseEntity { | |||||
| /*建筑面积**/ | /*建筑面积**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="建筑面积",name="buildArea") | @io.swagger.annotations.ApiModelProperty(value="建筑面积",name="buildArea") | ||||
| @Excel(name="建筑面积(㎡)",width = 20,orderNum = "5") | @Excel(name="建筑面积(㎡)",width = 20,orderNum = "5") | ||||
| @SortColumn(column = "buildArea") | |||||
| private String buildArea; | private String buildArea; | ||||
| /*经营面积**/ | /*经营面积**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="经营面积",name="operationArea") | @io.swagger.annotations.ApiModelProperty(value="经营面积",name="operationArea") | ||||
| @@ -7,7 +7,11 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| 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; | ||||
| @@ -14,7 +14,11 @@ public class WxMerchantTradeDailyVo extends BaseEntity { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| public Long getId() { | public Long getId() { | ||||
| return id; | return id; | ||||
| } | } | ||||
| @@ -1,12 +1,14 @@ | |||||
| package com.iformall.domain.vo; | package com.iformall.domain.vo; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| /** | /** | ||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| public class WxOrderQueryVo implements Serializable { | |||||
| public class WxOrderQueryVo extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -22,6 +24,11 @@ public class WxOrderQueryVo implements Serializable { | |||||
| private Integer payment; | private Integer payment; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| public String getTenantId() { | public String getTenantId() { | ||||
| return tenantId; | return tenantId; | ||||
| } | } | ||||
| @@ -1,12 +1,12 @@ | |||||
| package com.iformall.domain.vo; | package com.iformall.domain.vo; | ||||
| import java.io.Serializable; | |||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| /** | /** | ||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| public class WxProfitSharingOrderQueryVo implements Serializable { | |||||
| public class WxProfitSharingOrderQueryVo extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -23,6 +23,12 @@ public class WxProfitSharingOrderQueryVo implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") | @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") | ||||
| private Date enddate; | private Date enddate; | ||||
| @Override | |||||
| public String getSortColumns() { | |||||
| super.setSortColumns(this.sortColumns); | |||||
| return super.getSortColumns(); | |||||
| } | |||||
| public Long getId() { | public Long getId() { | ||||
| return id; | return id; | ||||
| } | } | ||||
| @@ -178,7 +178,6 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| wxBillDailyMapper.deleteByPrimaryKey(id); | wxBillDailyMapper.deleteByPrimaryKey(id); | ||||
| @@ -2309,12 +2309,17 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| datamap.put("total",total); | datamap.put("total",total); | ||||
| datamap.put("totalShop",totalShop); | datamap.put("totalShop",totalShop); | ||||
| datamap.put("totalPoint",totalPoint); | datamap.put("totalPoint",totalPoint); | ||||
| datamap.put("rentTotal",rentTotal); | datamap.put("rentTotal",rentTotal); | ||||
| datamap.put("rentTotalShop",rentTotalShop); | datamap.put("rentTotalShop",rentTotalShop); | ||||
| datamap.put("rentTotalPoint",rentTotalPoint); | datamap.put("rentTotalPoint",rentTotalPoint); | ||||
| datamap.put("notRentTotal",notRentTotal); | datamap.put("notRentTotal",notRentTotal); | ||||
| datamap.put("notRentTotalShop",notRentTotalShop); | datamap.put("notRentTotalShop",notRentTotalShop); | ||||
| datamap.put("notRentTotalPoint",notRentTotalPoint); | datamap.put("notRentTotalPoint",notRentTotalPoint); | ||||
| double totalRentRate = rentTotal/total*100; | |||||
| // datamap.put("totalPoint",su); | |||||
| return new ResultData(datamap); | return new ResultData(datamap); | ||||
| } | } | ||||
| @@ -83,7 +83,9 @@ | |||||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | ||||
| </where> | </where> | ||||
| order by id desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns">order by id desc</if> | |||||
| </select> | </select> | ||||
| <update id="updateNotPaidStatus" parameterType="hashmap"> | <update id="updateNotPaidStatus" parameterType="hashmap"> | ||||
| @@ -89,7 +89,8 @@ | |||||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | ||||
| </where> | </where> | ||||
| order by id desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns"> order by id desc </if> | |||||
| </select> | </select> | ||||
| <update id="updateNotPaidStatus" parameterType="hashmap"> | <update id="updateNotPaidStatus" parameterType="hashmap"> | ||||
| @@ -84,7 +84,9 @@ | |||||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | ||||
| </where> | </where> | ||||
| order by id desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns">order by id desc</if> | |||||
| </select> | </select> | ||||
| <update id="updateNotPaidStatus" parameterType="hashmap"> | <update id="updateNotPaidStatus" parameterType="hashmap"> | ||||
| @@ -559,7 +559,10 @@ | |||||
| and o.create_date between #{startdate} and #{enddate} | and o.create_date between #{startdate} and #{enddate} | ||||
| </if> | </if> | ||||
| </where> | </where> | ||||
| order by o.id desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns">order by o.id desc</if> | |||||
| </select> | </select> | ||||
| @@ -148,7 +148,9 @@ | |||||
| and pso.create_time between #{startdate} and #{enddate} | and pso.create_time between #{startdate} and #{enddate} | ||||
| </if> | </if> | ||||
| </where> | </where> | ||||
| order by pso.id desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns">order by pso.id desc</if> | |||||
| </select> | </select> | ||||
| <select id="queryOrderForMerchantCount" resultType="Long" parameterType="hashmap"> | <select id="queryOrderForMerchantCount" resultType="Long" parameterType="hashmap"> | ||||
| @@ -149,7 +149,7 @@ | |||||
| </select> | </select> | ||||
| <select id="findListMap" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | <select id="findListMap" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | ||||
| select s.id,s.shop_number shopNumber,s.build_area buildArea, | |||||
| select s.id,s.shop_number shopNumber,CONVERT( s.build_area,SIGNED) buildArea, | |||||
| s.img_url imgUrl,s.operation_area operationArea, | s.img_url imgUrl,s.operation_area operationArea, | ||||
| s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, | s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, | ||||
| m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone, | m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone, | ||||
| @@ -258,7 +258,7 @@ | |||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| <if test=" null != sortColumns">order by s.${sortColumns}</if> | |||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||||
| </select> | </select> | ||||