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

[首页统计][修改][优化展示]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
baa8392f88
5 измененных файлов: 35 добавлений и 6 удалений
  1. +9
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java
  2. +9
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  3. +9
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  4. +3
    -3
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  5. +5
    -2
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 9
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java Просмотреть файл

@@ -80,7 +80,15 @@ public class WxFlowAbleController extends BaseController {
logger.debug("[" + getIpAddr() + "] FlowAbleController::myApplyList");
record.setUserId(super.getUser().getId());
record.setStatus(EnumFlowRecordStatus.NEW.getCode());
return new ResultData(wxFlowService.listAsPage(record,pageNum,pageSize));

PageInfo<WxFlowRecord> pageInfo = wxFlowService.listAsPage(record,pageNum,pageSize);
List<WxFlowRecord> recordList = pageInfo.getList();
for (WxFlowRecord wxFlowRecord:recordList) {
if(StringUtils.isBlank(wxFlowRecord.getVariables())){
wxFlowRecord.setVariables("{}");
}
}
return new ResultData(pageInfo);
}

/**


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

@@ -131,6 +131,15 @@ public class WxBillProperty implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
private String comments;

@io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate")
private Integer receivePayUpdate;
public Integer getReceivePayUpdate() {
return receivePayUpdate;
}
public void setReceivePayUpdate(Integer receivePayUpdate) {
this.receivePayUpdate = receivePayUpdate;
}

public String getComments() {
return comments;
}


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

@@ -134,6 +134,15 @@ public class WxBillRent implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
private String comments;

@io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate")
private Integer receivePayUpdate;
public Integer getReceivePayUpdate() {
return receivePayUpdate;
}
public void setReceivePayUpdate(Integer receivePayUpdate) {
this.receivePayUpdate = receivePayUpdate;
}

public String getComments() {
return comments;
}


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

@@ -30,7 +30,7 @@
<result column="pay_way" jdbcType="INTEGER" property="payWay"/>
<result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/>
<result column="comments" jdbcType="VARCHAR" property="comments"/>
<result column="receive_pay_update" property="receivePayUpdate"/>
</resultMap>

<sql id="allColumns">
@@ -38,7 +38,7 @@
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
`pay_way`,`late_pay_status`,`comments`
`pay_way`,`late_pay_status`,`comments`,receive_pay_update
</sql>

<sql id="dynamicWhereConditions">
@@ -92,7 +92,7 @@
else br.late_pay_price end latePayPrice,
(select max(period) from wx_bill_property where property_contract_id=br.property_contract_id)
allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus,
br.`comments`
br.`comments`,br.receive_pay_update
from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id
left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id


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

@@ -30,6 +30,9 @@
<result column="pay_way" jdbcType="INTEGER" property="payWay"/>
<result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/>
<result column="comments" jdbcType="VARCHAR" property="comments"/>
<result column="starttime" property="starttime"/>
<result column="endtime" property="endtime"/>
<result column="receive_pay_update" property="receivePayUpdate"/>

</resultMap>

@@ -38,7 +41,7 @@
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
`pay_way`,`late_pay_status`,`comments`
`pay_way`,`late_pay_status`,`comments`,receive_pay_update
</sql>

<sql id="dynamicWhereConditions">
@@ -95,7 +98,7 @@
else br.late_pay_price end latePayPrice,
(select max(period) from wx_bill_rent where rent_contract_id=br.rent_contract_id) allPeriod,d.`status`
depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus,
br.`comments`
br.`comments`,br.receive_pay_update
from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id
left join wx_rent_contract r on br.rent_contract_id=r.id


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