From e706cc37a9643f2aac1791e45e30817ebcb564ae Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期三, 01 五月 2024 10:13:28 +0800 Subject: [PATCH] 费用统计增加时间段搜索 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java index ae0bf3d..0f676a6 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java @@ -590,7 +590,7 @@ product.setTemplate(new ArrayList<>()); continue; } - if (set.add(product.getTemplateId())) { + if (product.getTemplateId() != null && set.add(product.getTemplateId())) { map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + ""); } String thing = map2.get(product.getTemplateId()); @@ -603,6 +603,7 @@ style.put("columnlen", config.get("columnlen")); product.setTemplate(cellData); product.setStyle(style); + product.setTemplateName(standardTemplateService.getStandTempNameById(product.getTemplateId())); } } } -- Gitblit v1.9.3