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

[筛选器][修改][完善]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
05cca833c2
12 измененных файлов: 33 добавлений и 57 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java
  2. +2
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  3. +3
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  4. +2
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java
  5. +3
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  6. +1
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  7. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java
  8. +2
    -9
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java
  9. +7
    -4
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
  10. +3
    -1
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml
  11. +3
    -1
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
  12. +3
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

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

@@ -1,5 +1,6 @@
package com.iformall.domain.dto;

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

import java.util.Date;
@@ -8,7 +9,7 @@ import java.util.Date;
* Created by syf on 2018/8/30.
*/
@Data
public class WxOrderReportDto {
public class WxOrderReportDto extends BaseEntity{
private String tenantId;
private Long merchantId;
private String merchantName;


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

@@ -12,9 +12,8 @@ import java.util.List;
* @author gongbiao
*/
@Table(name = "wx_bill_property")
public class WxBillProperty implements Serializable {
private static final long serialVersionUID = 1L;
public class WxBillProperty extends BaseEntity {

@Id
protected Long id;
@@ -29,10 +28,6 @@ public class WxBillProperty implements Serializable {
public void setId(Long id) {
this.id = id;
}
public String getSortColumns() {
return sortColumns;
}
public List<Long> getIds() {
return ids;
}


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

@@ -12,9 +12,8 @@ import java.util.List;
* @author gongbiao
*/
@Table(name = "wx_bill_rent")
public class WxBillRent implements Serializable {
private static final long serialVersionUID = 1L;
public class WxBillRent extends BaseEntity {

@Id
protected Long id;
@@ -29,10 +28,7 @@ public class WxBillRent implements Serializable {
public void setId(Long id) {
this.id = id;
}
public String getSortColumns() {
return sortColumns;
}

public List<Long> getIds() {
return ids;
}


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

@@ -3,7 +3,6 @@ package com.iformall.domain.po;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -12,9 +11,7 @@ import java.util.List;
* @author gongbiao
*/
@Table(name = "wx_brand")
public class WxBrand implements Serializable {
private static final long serialVersionUID = 1L;
public class WxBrand extends BaseEntity{
@Id
protected Long id;
@@ -29,10 +26,7 @@ public class WxBrand implements Serializable {
public void setId(Long id) {
this.id = id;
}
public String getSortColumns() {
return sortColumns;
}

public List<Long> getIds() {
return ids;
}


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

@@ -13,9 +13,8 @@ import java.util.Map;
* @author gongbiao
*/
@Table(name = "wx_property_contract")
public class WxPropertyContract implements Serializable {
private static final long serialVersionUID = 1L;
public class WxPropertyContract extends BaseEntity {

@Id
protected Long id;

@@ -35,10 +34,7 @@ public class WxPropertyContract implements Serializable {
public void setId(Long id) {
this.id = id;
}
public String getSortColumns() {
return sortColumns;
}

public List<Long> getIds() {
return ids;
}


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

@@ -13,9 +13,7 @@ import java.util.Map;
* @author gongbiao
*/
@Table(name = "wx_rent_contract")
public class WxRentContract implements Serializable {
private static final long serialVersionUID = 1L;

public class WxRentContract extends BaseEntity {
@Id
protected Long id;

@@ -32,10 +30,6 @@ public class WxRentContract implements Serializable {
this.id = id;
}

public String getSortColumns() {
return sortColumns;
}

public List<Long> getIds() {
return ids;
}


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

@@ -1,14 +1,12 @@
package com.iformall.domain.vo;

import io.swagger.models.auth.In;

import com.iformall.domain.po.BaseEntity;
import java.util.List;

/**
* @author gongbiao
*/
public class WxBillAll {

public class WxBillAll extends BaseEntity {

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


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

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

import com.iformall.domain.po.BaseEntity;
import javax.persistence.Id;

import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

public class WxMerchantTradeDailyVo implements Serializable {
private static final long serialVersionUID = 1L;

public class WxMerchantTradeDailyVo extends BaseEntity {
@Id
protected Long id;

@@ -26,10 +23,6 @@ public class WxMerchantTradeDailyVo implements Serializable {
this.id = id;
}

public String getSortColumns() {
return sortColumns;
}

public List<String> getIds() {
return ids;
}


+ 7
- 4
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Просмотреть файл

@@ -100,9 +100,10 @@
<if test=" null != billTypeValue ">and bill.bill_type_value = #{billTypeValue}</if>
<if test=" null != status ">and bill.`status` = #{status}</if>
<if test=" null != rentShopType ">and bill.rent_shop_type = #{rentShopType}</if>
order by bill.id desc,bill.merchant_id,bill.status,bill.receive_date desc

<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by bill.id desc,bill.merchant_id,bill.status,bill.receive_date desc </if>

</select>
@@ -553,6 +554,8 @@
left join wx_merchant_shop ms on ms.`merchant_id` = m.id
left join wx_shop ws on ms.`shop_id` = ws.id
where m.status=1 and m.tenant_id = #{tenantId}
order by totalOwe desc

<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by totalOwe desc </if>
</select>
</mapper>

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

@@ -487,7 +487,9 @@
<if test=" null != merchantName ">
and wm.name like concat('%', #{merchantName},'%')
</if>
order by wm.create_date desc
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by wm.create_date desc </if>

</select>
<resultMap id="orderMap" type="com.iformall.domain.po.WxOrder">


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

@@ -131,7 +131,9 @@
<if test=" null != rentShopType">and rc.`rent_shop_type` = #{rentShopType}</if>
</where>
order by rc.id desc

<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns">order by rc.id desc</if>
</select>
<select id="queryRentContractWaitSignStatus" resultType="int"


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

@@ -134,7 +134,9 @@
<if test=" null != rentShopType ">and rc.`rent_shop_type` = #{rentShopType}</if>
</where>
order by rc.id desc
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by rc.id desc </if>

</select>
<select id="queryRentContractWaitSignStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract">


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