From b5c4e16a1379769ce654066eb20252c3754ae1d0 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 29 Oct 2024 15:28:05 +0800 Subject: [PATCH 1/3] 1127 --- .../dao/TechnicalSpecificationMapper.java | 2 +- .../PlmTechnicalSpecificationSheetData.java | 10 ++++++++- .../TechnicalSpecificationServiceImpl.java | 3 +-- .../TechnicalSpecificationMapper.xml | 22 +++++++++++-------- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index d5fcb18e..12425902 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -1150,5 +1150,5 @@ public interface TechnicalSpecificationMapper { List getFinalPartData(PlmProjectPartData data); - // PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data); + PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java index 05b30273..1ebfeda9 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -30,7 +30,7 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio private String partNo; private String partFamily; - + private String sp; private String buNo; private String buDesc; private String proofingNo; @@ -421,4 +421,12 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio public void setTechnicianNo(String technicianNo) { this.technicianNo = technicianNo; } + + public String getSp() { + return sp; + } + + public void setSp(String sp) { + this.sp = sp; + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index d789d228..ccbf3752 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -1362,7 +1362,6 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification @Override public PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data){ - // return technicalSpecificationMapper.getOADetailForBM(data); - return null; + return technicalSpecificationMapper.getOADetailForBM(data); } } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index c036acb5..c7c51099 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -1079,13 +1079,17 @@ step_id,reject_flag,reject_step_id,mpOperator,pod - - - - - - - - - + + \ No newline at end of file From 23f8e58c6a38aa4de1950f26d0aebf7dde33ecf5 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 29 Oct 2024 17:32:09 +0800 Subject: [PATCH 2/3] 1127 --- .../service/Impl/TechnicalSpecificationServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index ccbf3752..be036b34 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -1038,7 +1038,11 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification int startIndex = index + prefix.length(); String result =st3+ str.substring(startIndex); if (!result.endsWith("/")) { - result += "/"; + //判断 如果最后五个字符里面有. 说明地址是文件 如果没有. 说明是路径 后面增加一个斜杠 + String lastFiveChars = result.length() > 5 ? result.substring(str.length() - 5) : str; + if(!lastFiveChars.contains(".")){ + result += "/"; + } } data.setUrl(result); break; From 25d7efebf3afd9d5aae332f6c44322fe5d4b0c3b Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 29 Oct 2024 17:39:10 +0800 Subject: [PATCH 3/3] 1127 --- .../service/Impl/TechnicalSpecificationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index be036b34..2fe24bca 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -1039,7 +1039,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification String result =st3+ str.substring(startIndex); if (!result.endsWith("/")) { //判断 如果最后五个字符里面有. 说明地址是文件 如果没有. 说明是路径 后面增加一个斜杠 - String lastFiveChars = result.length() > 5 ? result.substring(str.length() - 5) : str; + String lastFiveChars = result.length() > 5 ? result.substring(result.length() - 5) : result; if(!lastFiveChars.contains(".")){ result += "/"; }