From 517c1706585ce13b637faa8d0fb0fc263c823d25 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Wed, 30 Oct 2024 00:32:45 +0800
Subject: [PATCH] =?UTF-8?q?2024.10.30=20=E6=96=87=E6=A1=A3=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/EamObjectController.java  |  4 ++--
 .../sys/modules/pms/mapper/EamObjectMapper.java      |  2 ++
 .../sys/modules/pms/service/EamObjectService.java    |  2 +-
 .../pms/service/Impl/EamObjectServiceImpl.java       | 12 ++++++++++--
 src/main/resources/mapper/pms/EamObjectMapper.xml    |  3 +++
 src/main/resources/mapper/pms/EamProjectMapper.xml   |  4 +++-
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java
index 77b42340..9e3a246c 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java
@@ -87,8 +87,8 @@ public class EamObjectController {
      * @throw
      */
     @PostMapping(value = "/downLoadObjectFile")
-    public void downLoadObjectFile(@RequestParam("id") Integer id, HttpServletResponse response) throws UnsupportedEncodingException {
-        eamObjectService.downLoadObjectFile(id,response);
+    public void downLoadObjectFile(@RequestParam("id") Integer id,@RequestParam("orderRef3")String orderRef3, HttpServletResponse response) throws UnsupportedEncodingException {
+        eamObjectService.downLoadObjectFile(id,orderRef3,response);
     }
 
     /**
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamObjectMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamObjectMapper.java
index 7a824fdb..787d3835 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamObjectMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamObjectMapper.java
@@ -73,4 +73,6 @@ public interface EamObjectMapper {
     List<SysOssEntity> getFileData(Integer id);
 
     List<SysOssEntity> getFileDataMes(Integer id);
+
+    List<SysOssEntity> getSopFileData(Integer id);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamObjectService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamObjectService.java
index 39198984..5eb1c807 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/EamObjectService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/EamObjectService.java
@@ -59,7 +59,7 @@ public interface EamObjectService {
      * @return void
      * @throw
      */
-    void downLoadObjectFile(Integer id ,HttpServletResponse response) throws UnsupportedEncodingException;
+    void downLoadObjectFile(Integer id ,String orderRef3,HttpServletResponse response) throws UnsupportedEncodingException;
 
     void downLoadObjectFileMes(Integer id, HttpServletResponse response) throws UnsupportedEncodingException;
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java
index e54bca54..cb838174 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java
@@ -203,9 +203,17 @@ public class EamObjectServiceImpl implements EamObjectService {
     }
 
     @Override
-    public void downLoadObjectFile(Integer id, HttpServletResponse response) throws UnsupportedEncodingException {
+    public void downLoadObjectFile(Integer id,String orderRef3, HttpServletResponse response) throws UnsupportedEncodingException {
         //处理路径和名称
-        List<SysOssEntity> getFileData = eamObjectMapper.getFileData(id);
+        if (orderRef3 == null){
+            orderRef3 = "9.9";
+        }
+        List<SysOssEntity> getFileData;
+        if (orderRef3.equals("-2")){
+            getFileData = eamObjectMapper.getSopFileData(id);
+        } else {
+            getFileData = eamObjectMapper.getFileData(id);
+        }
         if (getFileData.isEmpty()) {
             throw new RuntimeException("该文件不存在，请刷新列表");
         }
diff --git a/src/main/resources/mapper/pms/EamObjectMapper.xml b/src/main/resources/mapper/pms/EamObjectMapper.xml
index 8d90eec5..8139a122 100644
--- a/src/main/resources/mapper/pms/EamObjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamObjectMapper.xml
@@ -153,5 +153,8 @@
         from part_sop
         where id = #{id}
     </select>
+    <select id="getSopFileData" resultType="com.xujie.sys.modules.oss.entity.SysOssEntity">
+        select sop_url as url,sop_name + '.' + SUBSTRING(sop_url, CHARINDEX('.', sop_url) + 1, LEN(sop_url)) as file_name,sop_name + '.' + SUBSTRING(sop_url, CHARINDEX('.', sop_url) + 1, LEN(sop_url)) as new_file_name from part_sop where id = #{id}
+    </select>
 
 </mapper>
diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml
index 48b8d427..c1810b16 100644
--- a/src/main/resources/mapper/pms/EamProjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamProjectMapper.xml
@@ -534,10 +534,12 @@
         WHERE a.BU = #{buNo} and a.Site = #{site} and a.document_type = '产品文档' and a.userid = #{userid}
     </select>
     <select id="searchSopFileList" resultType="com.xujie.sys.modules.oss.entity.SysOssEntity">
-        SELECT a.sop_name as file_name,
+        SELECT a.sop_name + '.' + SUBSTRING(sop_url, CHARINDEX('.', sop_url) + 1, LEN(sop_url)) as file_name,
                a.creation_date as create_date,
                a.created_by as created_by,
                a.sop_url as url,
+               a.id,
+               '-2' as order_ref3,
                 SUBSTRING(a.sop_url, CHARINDEX('.', a.sop_url) + 1, LEN(a.sop_url)) as file_type
         FROM part_sop as a
         <where>