Merge branch 'master' of https://gitee.com/hdka/FURNITURE-OA
This commit is contained in:
@@ -59,7 +59,6 @@ public class GearPurchasePlanDetailServiceImpl implements IGearPurchasePlanDetai
|
||||
query.eq(bo.getQuantity()!=null, "d.quantity", bo.getQuantity());
|
||||
query.eq(StringUtils.isNotBlank(bo.getUnit()), "d.unit", bo.getUnit());
|
||||
query.eq(bo.getUnitPrice() != null, "d.unit_price", bo.getUnitPrice());
|
||||
query.eq(bo.getTotalAmount() != null, "d.total_amount", bo.getTotalAmount());
|
||||
query.eq(StringUtils.isNotBlank(bo.getAnnex()), "d.annex", bo.getAnnex());
|
||||
query.eq(bo.getStatus() != null, "d.status", bo.getStatus());
|
||||
// 逻辑删除
|
||||
@@ -87,7 +86,6 @@ public class GearPurchasePlanDetailServiceImpl implements IGearPurchasePlanDetai
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getRawMaterialName()), GearPurchasePlanDetail::getQuantity, bo.getQuantity());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), GearPurchasePlanDetail::getUnit, bo.getUnit());
|
||||
lqw.eq(bo.getUnitPrice() != null, GearPurchasePlanDetail::getUnitPrice, bo.getUnitPrice());
|
||||
lqw.eq(bo.getTotalAmount() != null, GearPurchasePlanDetail::getTotalAmount, bo.getTotalAmount());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAnnex()), GearPurchasePlanDetail::getAnnex, bo.getAnnex());
|
||||
lqw.eq(bo.getStatus() != null, GearPurchasePlanDetail::getStatus, bo.getStatus());
|
||||
return lqw;
|
||||
|
||||
Reference in New Issue
Block a user