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

[审批][修改][修改审批模板]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
2f40f585cd
4 измененных файлов: 17 добавлений и 13 удалений
  1. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
  3. +2
    -1
      mallinkService/src/main/resources/mapper/WxBillActionMapper.xml
  4. +12
    -11
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

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

@@ -122,7 +122,6 @@ public class WxBillAll extends BaseEntity {




@Transient
@io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay")
private Integer filterHasPay;


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

@@ -65,6 +65,9 @@ public class WxBillAllVo {

private String name;

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

public String getReceivePayStr() {
if(getReceivePay()!=null) {
receivePayStr = new BigDecimal(getReceivePay()).divide(new BigDecimal(100)).toString();


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

@@ -15,7 +15,8 @@
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`bill_id`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime`
`id`,`tenant_id`,`bill_id`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime`,

</sql>
<sql id="dynamicWhereConditions">


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

@@ -34,7 +34,8 @@
<result column="shopInfo" jdbcType="VARCHAR" property="shopInfo"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="comments" property="comments"/>

</resultMap>


@@ -47,49 +48,49 @@
,bill.receive_date receiveDate,
bill.pay_date payDate,DATEDIFF(now(),bill.receive_date) expiredDay,bill.status,bill.starttime,
bill.endtime,bill.name,bill.rent_shop_type rentShopType,m.name merchantName,
s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo
s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo,bill.comments
from (
select id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,''
endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info
endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments
from wx_bill_rent where is_preview = 0
union
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,''
endtime,rent_shop_type,shop_info from wx_bill_rent_deposit
endtime,rent_shop_type,shop_info,NULL comments from wx_bill_rent_deposit
union
select id,merchant_id,shop_id,tenant_id,'物业费' name,3 bill_type_value,'物业费'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,''
endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info
endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments
from wx_bill_property where is_preview = 0
union
select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,''
endtime,rent_shop_type,shop_info from wx_bill_property_deposit
endtime,rent_shop_type,shop_info,NULL comments from wx_bill_property_deposit
union
select id,merchant_id,shop_id,tenant_id,'水费' name,5 bill_type_value,'水费' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
rent_shop_type,'[]' shop_info,NULL comments
from wx_bill_daily where type=1
union
select id,merchant_id,shop_id,tenant_id,'电费' name,6 bill_type_value,'电费' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
rent_shop_type,'[]' shop_info,NULL comments
from wx_bill_daily where type=2
union
select id,merchant_id,shop_id,tenant_id,'空调费' name,9 bill_type_value,'空调费' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
rent_shop_type,'[]' shop_info,NULL comments
from wx_bill_daily where type=3
union
select id,merchant_id,shop_id,tenant_id,name,7 bill_type_value,'其他' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
rent_shop_type,'[]' shop_info,comments
from wx_bill_other
union
select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,'其他押金' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
rent_shop_type,'[]' shop_info,comments
from wx_bill_other_deposit
) bill
left join wx_merchant m on bill.merchant_id=m.id


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