From 70e5a394c213181c3479f56fca0b5e469c34f7f4 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Thu, 11 Jul 2024 17:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A0=86=E6=89=93=E5=8C=85Bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/vo/pack/PackageDetailsRespVO.java | 12 +++++----- .../manage/service/pack/PackServiceImpl.java | 23 ++++++++++--------- .../query/ProductionStatusServiceImpl.java | 10 ++++---- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java index c8efeac34..77c69d785 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java @@ -52,14 +52,14 @@ public class PackageDetailsRespVO { @Schema(description = "纹路", requiredMode = Schema.RequiredMode.REQUIRED) private String texture; - @Schema(description = "异形数量", requiredMode = Schema.RequiredMode.REQUIRED) - private String specialShaped; + @Schema(description = "是否异型", requiredMode = Schema.RequiredMode.REQUIRED) + private Boolean specialShaped; - @Schema(description = "造型数量", requiredMode = Schema.RequiredMode.REQUIRED) - private String profiling; + @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED) + private Boolean profiling; - @Schema(description = "排孔数量", requiredMode = Schema.RequiredMode.REQUIRED) - private String rowHole; + @Schema(description = "是否有孔", requiredMode = Schema.RequiredMode.REQUIRED) + private Boolean rowHole; @Schema(description = "加工组", requiredMode = Schema.RequiredMode.REQUIRED) private String processGroup; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index ff42aeb95..26d9e87ef 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -129,13 +129,14 @@ public class PackServiceImpl implements PackService { for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) { String name = ""; - for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { - // 去除最后的逗号 - name += groupNameList.getName()+","; + if(!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) { + for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { + // 去除最后的逗号 + name += groupNameList.getName() + ","; + } + name = name.substring(0, name.length() - 1); } - name = name.substring(0, name.length() - 1); - plateDetailsRespVO.setProcessGroup(name); } @@ -154,13 +155,13 @@ public class PackServiceImpl implements PackService { for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) { String name = ""; - for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { - // 去除最后的逗号 - name += groupNameList.getName()+","; - + if(!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) { + for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { + // 去除最后的逗号 + name += groupNameList.getName() + ","; + } + name = name.substring(0, name.length() - 1); } - name = name.substring(0, name.length() - 1); - plateDetailsRespVO.setProcessGroup(name); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java index 187dc69d7..fb0090df7 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java @@ -204,12 +204,14 @@ public class ProductionStatusServiceImpl implements ProductionStatusService { for (PackageDetailsRespVO plateDetailsRespVO : packageDetailsRespVOS) { String name = ""; - for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { - // 去除最后的逗号 - name += groupNameList.getName()+","; + if(!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) { + for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { + // 去除最后的逗号 + name += groupNameList.getName() + ","; + } + name = name.substring(0, name.length() - 1); } - name = name.substring(0, name.length() - 1); plateDetailsRespVO.setProcessGroup(name); }