diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java index 00ebb67..213798a 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java @@ -68,4 +68,9 @@ public class PurchaseBillExVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("最后修改时间") private Date modifyTime; + + @ApiModelProperty("收货状态value") + private String receiveStateValue; + @ApiModelProperty("发货状态value") + private String deliveryStateValue; } diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml index 8d6258b..0877d22 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml @@ -56,12 +56,14 @@ when 2 then '已审核' when 3 then '审核未通过' end as state, SUM(pbd.amount) AS amountTotal, - pba.thisPayAmount, SUM(pbd.taxAmount) AS taxAmount, SUM(pbd.count) AS countTotal, pb.`remarks`, pb.`createByName`, - pb.`modifyTime` + pb.`modifyTime`, + pba.prepayment AS thisPayAmount, + pbe.receiveStateValue, + pbe.deliveryStateValue FROM purchase_bill pb LEFT JOIN purchase_bill_detail pbd