Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@@ -1150,5 +1150,5 @@ public interface TechnicalSpecificationMapper {
 
     List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data);
 
-    // PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data);
+    PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data);
 }

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;
+    }
 }

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(result.length() - 5) : result;
+                    if(!lastFiveChars.contains(".")){
+                        result += "/";
+                    }
                 }
                 data.setUrl(result);
                 break;
@@ -1362,7 +1366,6 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
 
     @Override
     public PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data){
-        // return technicalSpecificationMapper.getOADetailForBM(data);
-        return null;
+        return technicalSpecificationMapper.getOADetailForBM(data);
     }
 }

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -1079,13 +1079,17 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
         </where>
     </select>
 
-<!--    <select id="getOADetailForBM" resultType="PlmTechnicalSpecificationSheetData">-->
-<!--                d.is_reject,-->
-<!--        d.node_id,-->
-<!--        d.node_name,-->
-<!--        d.create_by as createBy2-->
-<!--       left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}-->
-<!--        left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id-->
-
-<!--    </select>-->
+    <select id="getOADetailForBM" resultType="PlmTechnicalSpecificationSheetData">
+        select
+        top 1
+        d.is_reject,
+        d.node_id,
+        d.node_name,
+        d.create_by as sp
+        from plm_technical_specification_sheet a
+       left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002'
+        left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
+        where a.site=#{site} and a.code_no=#{codeNo}
+    </select>
+
 </mapper>