winter 2 лет назад
Родитель
Сommit
ecb885858c
10 измененных файлов: 76 добавлений и 8 удалений
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java
  2. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java
  3. +8
    -1
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
  4. +8
    -1
      mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
  5. +8
    -1
      mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
  6. +8
    -1
      mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
  7. +8
    -1
      mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
  8. +8
    -1
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  9. +8
    -1
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml
  10. +8
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

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

@@ -4,6 +4,7 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;

import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -27,6 +28,9 @@ public class WxBillSum implements Serializable {
@TableField(exist = false)
private BigDecimal oweNumber;
private Date minDate;
private Date maxDate;
public BigDecimal getNeedPayNumber() {
if (StringUtils.isNotBlank(needPay)) {
this.needPayNumber = new BigDecimal(needPay);


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

@@ -9,6 +9,7 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
import java.util.List;

@Data
@@ -49,6 +50,13 @@ public class WxMerchantBillVo implements Serializable {
return StringUtils.isBlank(owe) ? "0" : new BigDecimal(owe).toPlainString();
}
@Excel(name = "账单最小日期", width = 20, orderNum = "7")
private Date minDate;
@Excel(name = "账单最大日期", width = 20, orderNum = "8")
private Date maxDate;
@TableField(exist = false)
private List<WxBillSum> billSumList;


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

@@ -139,9 +139,16 @@
<resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum">
<result column="receive_pay" jdbcType="VARCHAR" property="needPay"/>
<result column="paid" jdbcType="VARCHAR" property="paid" />
<result column="min_date" jdbcType="TIMESTAMP" property="minDate" />
<result column="max_date" jdbcType="TIMESTAMP" property="maxDate" />
</resultMap>
<select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillDaily" resultMap="SumBaseResultMap">
select sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay , sum(CAST(br.pay AS DECIMAL(20,2))) paid from wx_bill_daily br
select
sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(br.pay AS DECIMAL(20,2))) paid,
min(starttime) min_date,
max(endtime) max_date
from wx_bill_daily br
<include refid="queryBillDailyListConditions"/>
</select>


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

@@ -171,9 +171,16 @@
<resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum">
<result column="receive_pay" jdbcType="VARCHAR" property="needPay"/>
<result column="paid" jdbcType="VARCHAR" property="paid" />
<result column="min_date" jdbcType="TIMESTAMP" property="minDate" />
<result column="max_date" jdbcType="TIMESTAMP" property="maxDate" />
</resultMap>
<select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="SumBaseResultMap">
select sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay , sum(CAST(br.pay AS DECIMAL(20,2))) paid from wx_bill_rent_deposit br
select
sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(br.pay AS DECIMAL(20,2))) paid,
min(starttime) min_date,
max(endtime) max_date
from wx_bill_rent_deposit br
<include refid="queryBillRentListCondition"/>
</select>


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

@@ -143,9 +143,16 @@
<resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum">
<result column="receive_pay" jdbcType="VARCHAR" property="needPay"/>
<result column="paid" jdbcType="VARCHAR" property="paid" />
<result column="min_date" jdbcType="TIMESTAMP" property="minDate" />
<result column="max_date" jdbcType="TIMESTAMP" property="maxDate" />
</resultMap>
<select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="SumBaseResultMap">
select sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay , sum(CAST(br.pay AS DECIMAL(20,2))) paid from wx_bill_other_deposit br
select
sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(br.pay AS DECIMAL(20,2))) paid,
min(starttime) min_date,
max(endtime) max_date
from wx_bill_other_deposit br
<include refid="queryBillListConditions"/>
</select>


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

@@ -138,9 +138,16 @@
<resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum">
<result column="receive_pay" jdbcType="VARCHAR" property="needPay"/>
<result column="paid" jdbcType="VARCHAR" property="paid" />
<result column="min_date" jdbcType="TIMESTAMP" property="minDate" />
<result column="max_date" jdbcType="TIMESTAMP" property="maxDate" />
</resultMap>
<select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillOther" resultMap="SumBaseResultMap">
select sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay , sum(CAST(br.pay AS DECIMAL(20,2))) paid from wx_bill_other br
select
sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(br.pay AS DECIMAL(20,2))) paid,
min(starttime) min_date,
max(endtime) max_date
from wx_bill_other br
<include refid="queryBillListConditions"/>
</select>


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

@@ -146,9 +146,16 @@
<resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum">
<result column="receive_pay" jdbcType="VARCHAR" property="needPay"/>
<result column="paid" jdbcType="VARCHAR" property="paid" />
<result column="min_date" jdbcType="TIMESTAMP" property="minDate" />
<result column="max_date" jdbcType="TIMESTAMP" property="maxDate" />
</resultMap>
<select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="SumBaseResultMap">
select sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay , sum(CAST(br.pay AS DECIMAL(20,2))) paid from wx_bill_property_deposit br
select
sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(br.pay AS DECIMAL(20,2))) paid,
min(starttime) min_date,
max(endtime) max_date
from wx_bill_property_deposit br
<include refid="queryBillDepositListConditions"/>
</select>


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

@@ -188,9 +188,16 @@
<resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum">
<result column="receive_pay" jdbcType="VARCHAR" property="needPay"/>
<result column="paid" jdbcType="VARCHAR" property="paid" />
<result column="min_date" jdbcType="TIMESTAMP" property="minDate" />
<result column="max_date" jdbcType="TIMESTAMP" property="maxDate" />
</resultMap>
<select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillProperty" resultMap="SumBaseResultMap">
select sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay , sum(CAST(br.pay AS DECIMAL(20,2))) paid from wx_bill_property br
select
sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(br.pay AS DECIMAL(20,2))) paid,
min(starttime) min_date,
max(endtime) max_date
from wx_bill_property br
<include refid="queryBillPropertyListConditions"/>
</select>


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

@@ -165,9 +165,16 @@
<resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum">
<result column="receive_pay" jdbcType="VARCHAR" property="needPay"/>
<result column="paid" jdbcType="VARCHAR" property="paid" />
<result column="min_date" jdbcType="TIMESTAMP" property="minDate" />
<result column="max_date" jdbcType="TIMESTAMP" property="maxDate" />
</resultMap>
<select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillRentManage" resultMap="SumBaseResultMap">
select sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay , sum(CAST(br.pay AS DECIMAL(20,2))) paid from wx_bill_rent_manage br
select
sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(br.pay AS DECIMAL(20,2))) paid ,
min(starttime) min_date,
max(endtime) max_date
from wx_bill_rent_manage br
<include refid="queryBillManageListConditions"/>
</select>


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

@@ -188,9 +188,16 @@
<resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum">
<result column="receive_pay" jdbcType="VARCHAR" property="needPay"/>
<result column="paid" jdbcType="VARCHAR" property="paid" />
<result column="min_date" jdbcType="TIMESTAMP" property="minDate" />
<result column="max_date" jdbcType="TIMESTAMP" property="maxDate" />
</resultMap>
<select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillRent" resultMap="SumBaseResultMap">
select sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay , sum(CAST(br.pay AS DECIMAL(20,2))) paid from wx_bill_rent br
select
sum(CAST(br.receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(br.pay AS DECIMAL(20,2))) paid,
min(starttime) min_date,
max(endtime) max_date
from wx_bill_rent br
<include refid="queryBillRentListCondition"/>
</select>


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