From 5e15f28db8bf83cc19697e1ce2bd0078cd9cdfb8 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期四, 23 一月 2025 17:07:51 +0800 Subject: [PATCH] zjh20250123 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index e40cbd1..cfe7bce 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -1386,8 +1386,8 @@ wrapper.eq(TbTransition::getTjNum, tjOrder.getTjNumber()); wrapper.eq(TbTransition::getCusId, tjCustomer.getCusIdcard()); wrapper.eq(TbTransition::getCardId, tjCustomer.getCardId()); - wrapper.isNotNull(TbTransition::getOrdPrice); - wrapper.gt(TbTransition::getOrdPrice, 0); + wrapper.isNotNull(TbTransition::getNowPrice); + wrapper.gt(TbTransition::getNowPrice, 0); List<TbTransition> list = tbTransitionService.list(wrapper); for (TbTransition transition : list) { @@ -1401,7 +1401,7 @@ JSONObject obj = JSONUtil.createObj(); Integer sl = project.getSl(); - BigDecimal danjia = transition.getOrdPrice(); + BigDecimal danjia = transition.getNowPrice(); BigDecimal allPrice = danjia.multiply(new BigDecimal(sl)); obj.putOpt("danJia", danjia); obj.putOpt("jieSuanJe", allPrice); @@ -1410,11 +1410,6 @@ obj.putOpt("zhiXingKsMc", dept.getDeptName()); obj.putOpt("shouFeiXmId", project.getHisXmbm()); obj.putOpt("shouFeiXmMc", project.getHisXmmc()); - -// obj.putOpt("zhiXingKs","7805"); -// obj.putOpt("zhiXingKsMc","浣撴绉�"); -// obj.putOpt("shouFeiXmId","4735346"); -// obj.putOpt("shouFeiXmMc","浣撴璐�"); array.add(obj); } map.put("feiYongInfoList", array); -- Gitblit v1.8.0