From b3a30267d5fcb3e2a4f19441b8667c728fd28609 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期五, 18 七月 2025 14:37:39 +0800 Subject: [PATCH] 报告弃检重复问题 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2 ++ 1 files changed, 2 insertions(+), 0 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 0adee6c..081d0c2 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 @@ -2949,10 +2949,12 @@ for (TbTransition tbTransition : list) { if (tbTransition.getParentProId().toString().equals(project.getProId().toString())) { JSONObject obj = JSONUtil.createObj(); + TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, tbTransition.getParentProId().toString()); obj.putOpt("index", index++); obj.putOpt("parent_pro_name", tbTransition.getParentProName()); obj.putOpt("price", tbTransition.getOrdPrice()); obj.putOpt("ks", dept.getDeptName()); + if(null !=remark) obj.putOpt("sfzt", remark.getSfbz()); huiZong.add(obj); } } -- Gitblit v1.8.0