Sfoglia il codice sorgente

[账单总览][修改][导出数据]

release_toaliyun_real
gongbiao 6 anni fa
parent
commit
bae33f1b9b
3 ha cambiato i file con 10 aggiunte e 5 eliminazioni
  1. +0
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +10
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
  3. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 0
- 2
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Vedi File

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.domain.vo.WxBillExcelTemplate;
import com.iformall.service.WxBillAllService;
@@ -54,7 +53,6 @@ public class WxBillAllController extends BaseController {
@SystemControllerLog(description = "账单总览-列表")
public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::list");
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillAll.getTenantId());
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}


+ 10
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java Vedi File

@@ -32,9 +32,11 @@ public class WxBillAllVo {
@Excel(name="费用类型",width = 20,orderNum = "4")
private String billType;

@Excel(name="实际应收金额(元)",width = 20,orderNum = "5")
private String receivePayStr;

@Excel(name = "实际应收总金额(元)", width = 20, orderNum = "5")
private String realReceivePayStr;

@Excel(name="实收金额(元)",width = 20,orderNum = "6")
private String payStr;

@@ -122,6 +124,13 @@ public class WxBillAllVo {
@TableField(exist = false)
private Long realReceivePay;

public String getRealReceivePayStr() {
if (getRealReceivePay() != null) {
realReceivePayStr = new BigDecimal(getRealReceivePay()).divide(new BigDecimal(100)).toString();
}
return realReceivePayStr;
}

@io.swagger.annotations.ApiModelProperty(value = "滞纳金", name = "latePayPrice")
private Long latePayPrice;
}

+ 0
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Vedi File

@@ -136,8 +136,6 @@ public class WxBillAllServiceImpl implements WxBillAllService {

@Override
public Map<String, Object> listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) {
//更新各账单状态
//updateBillStatus(record);
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId());

if (StringUtils.isNotEmpty(record.getTypeStr())) {


Caricamento…
Annulla
Salva