| @@ -4,6 +4,7 @@ import lombok.Data; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.math.RoundingMode; | import java.math.RoundingMode; | ||||
| import java.util.Date; | |||||
| import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; | import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| @@ -27,6 +28,9 @@ public class WxBillSum implements Serializable { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private BigDecimal oweNumber; | private BigDecimal oweNumber; | ||||
| private Date minDate; | |||||
| private Date maxDate; | |||||
| public BigDecimal getNeedPayNumber() { | public BigDecimal getNeedPayNumber() { | ||||
| if (StringUtils.isNotBlank(needPay)) { | if (StringUtils.isNotBlank(needPay)) { | ||||
| this.needPayNumber = new BigDecimal(needPay); | this.needPayNumber = new BigDecimal(needPay); | ||||
| @@ -9,6 +9,7 @@ import lombok.Data; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.math.RoundingMode; | import java.math.RoundingMode; | ||||
| import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Data | @Data | ||||
| @@ -49,6 +50,13 @@ public class WxMerchantBillVo implements Serializable { | |||||
| return StringUtils.isBlank(owe) ? "0" : new BigDecimal(owe).toPlainString(); | 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) | @TableField(exist = false) | ||||
| private List<WxBillSum> billSumList; | private List<WxBillSum> billSumList; | ||||
| @@ -139,9 +139,16 @@ | |||||
| <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | ||||
| <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | ||||
| <result column="paid" jdbcType="VARCHAR" property="paid" /> | <result column="paid" jdbcType="VARCHAR" property="paid" /> | ||||
| <result column="min_date" jdbcType="TIMESTAMP" property="minDate" /> | |||||
| <result column="max_date" jdbcType="TIMESTAMP" property="maxDate" /> | |||||
| </resultMap> | </resultMap> | ||||
| <select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillDaily" resultMap="SumBaseResultMap"> | <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"/> | <include refid="queryBillDailyListConditions"/> | ||||
| </select> | </select> | ||||
| @@ -171,9 +171,16 @@ | |||||
| <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | ||||
| <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | ||||
| <result column="paid" jdbcType="VARCHAR" property="paid" /> | <result column="paid" jdbcType="VARCHAR" property="paid" /> | ||||
| <result column="min_date" jdbcType="TIMESTAMP" property="minDate" /> | |||||
| <result column="max_date" jdbcType="TIMESTAMP" property="maxDate" /> | |||||
| </resultMap> | </resultMap> | ||||
| <select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="SumBaseResultMap"> | <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"/> | <include refid="queryBillRentListCondition"/> | ||||
| </select> | </select> | ||||
| @@ -143,9 +143,16 @@ | |||||
| <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | ||||
| <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | ||||
| <result column="paid" jdbcType="VARCHAR" property="paid" /> | <result column="paid" jdbcType="VARCHAR" property="paid" /> | ||||
| <result column="min_date" jdbcType="TIMESTAMP" property="minDate" /> | |||||
| <result column="max_date" jdbcType="TIMESTAMP" property="maxDate" /> | |||||
| </resultMap> | </resultMap> | ||||
| <select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="SumBaseResultMap"> | <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"/> | <include refid="queryBillListConditions"/> | ||||
| </select> | </select> | ||||
| @@ -138,9 +138,16 @@ | |||||
| <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | ||||
| <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | ||||
| <result column="paid" jdbcType="VARCHAR" property="paid" /> | <result column="paid" jdbcType="VARCHAR" property="paid" /> | ||||
| <result column="min_date" jdbcType="TIMESTAMP" property="minDate" /> | |||||
| <result column="max_date" jdbcType="TIMESTAMP" property="maxDate" /> | |||||
| </resultMap> | </resultMap> | ||||
| <select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillOther" resultMap="SumBaseResultMap"> | <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"/> | <include refid="queryBillListConditions"/> | ||||
| </select> | </select> | ||||
| @@ -146,9 +146,16 @@ | |||||
| <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | ||||
| <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | ||||
| <result column="paid" jdbcType="VARCHAR" property="paid" /> | <result column="paid" jdbcType="VARCHAR" property="paid" /> | ||||
| <result column="min_date" jdbcType="TIMESTAMP" property="minDate" /> | |||||
| <result column="max_date" jdbcType="TIMESTAMP" property="maxDate" /> | |||||
| </resultMap> | </resultMap> | ||||
| <select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="SumBaseResultMap"> | <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"/> | <include refid="queryBillDepositListConditions"/> | ||||
| </select> | </select> | ||||
| @@ -188,9 +188,16 @@ | |||||
| <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | ||||
| <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | ||||
| <result column="paid" jdbcType="VARCHAR" property="paid" /> | <result column="paid" jdbcType="VARCHAR" property="paid" /> | ||||
| <result column="min_date" jdbcType="TIMESTAMP" property="minDate" /> | |||||
| <result column="max_date" jdbcType="TIMESTAMP" property="maxDate" /> | |||||
| </resultMap> | </resultMap> | ||||
| <select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillProperty" resultMap="SumBaseResultMap"> | <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"/> | <include refid="queryBillPropertyListConditions"/> | ||||
| </select> | </select> | ||||
| @@ -165,9 +165,16 @@ | |||||
| <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | ||||
| <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | ||||
| <result column="paid" jdbcType="VARCHAR" property="paid" /> | <result column="paid" jdbcType="VARCHAR" property="paid" /> | ||||
| <result column="min_date" jdbcType="TIMESTAMP" property="minDate" /> | |||||
| <result column="max_date" jdbcType="TIMESTAMP" property="maxDate" /> | |||||
| </resultMap> | </resultMap> | ||||
| <select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillRentManage" resultMap="SumBaseResultMap"> | <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"/> | <include refid="queryBillManageListConditions"/> | ||||
| </select> | </select> | ||||
| @@ -188,9 +188,16 @@ | |||||
| <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | <resultMap id="SumBaseResultMap" type="com.iformall.domain.vo.WxBillSum"> | ||||
| <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | <result column="receive_pay" jdbcType="VARCHAR" property="needPay"/> | ||||
| <result column="paid" jdbcType="VARCHAR" property="paid" /> | <result column="paid" jdbcType="VARCHAR" property="paid" /> | ||||
| <result column="min_date" jdbcType="TIMESTAMP" property="minDate" /> | |||||
| <result column="max_date" jdbcType="TIMESTAMP" property="maxDate" /> | |||||
| </resultMap> | </resultMap> | ||||
| <select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxBillRent" resultMap="SumBaseResultMap"> | <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"/> | <include refid="queryBillRentListCondition"/> | ||||
| </select> | </select> | ||||