From 672e78564571f8855abfb364e46829acb04baf7e Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 14 May 2025 16:08:54 +0800
Subject: [PATCH] 2025-05-14

---
 .../TechnicalSpecificationController.java     |  8 +++
 .../dao/TechnicalSpecificationMapper.java     |  3 ++
 .../TechnicalSpecificationServiceImpl.java    |  5 ++
 .../TechnicalSpecificationService.java        |  3 ++
 .../TechnicalSpecificationMapper.xml          | 53 +++++++++++++++++--
 5 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
index 3cd20783..d1c0e4e4 100644
--- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
+++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
@@ -6,6 +6,7 @@ import com.spring.common.utils.PageUtils;
 import com.spring.common.utils.R;
 import com.spring.modules.base.data.PlmBmModelHeaderData;
 import com.spring.modules.base.data.PlmBmPropertiesValueData;
+import com.spring.modules.change.vo.ChangeRequestVo;
 import com.spring.modules.part.entity.BomDetailEntity;
 import com.spring.modules.part.entity.RoutingDetailEntity;
 import com.spring.modules.part.vo.*;
@@ -1242,4 +1243,11 @@ public class TechnicalSpecificationController {
         technicalSpecificationService.copyBm(data);
         return R.ok();
     }
+
+    @PostMapping("/change/log")
+    @ResponseBody
+    public R changeLog(@RequestBody PlmTechnicalSpecificationSheetData data) {
+        List<ChangeRequestVo> list = technicalSpecificationService.queryChangeLog(data);
+        return R.ok().put("rows",list);
+    }
 }
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 184dec0f..111686bc 100644
--- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
+++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.spring.modules.base.data.*;
 import com.spring.modules.base.entity.PlmBmPageBaseData;
 import com.spring.modules.base.entity.SysProxyAddress;
+import com.spring.modules.change.vo.ChangeRequestVo;
 import com.spring.modules.part.entity.BomDetailEntity;
 import com.spring.modules.part.entity.BomHeaderEntity;
 import com.spring.modules.part.entity.RoutingDetailEntity;
@@ -1175,4 +1176,6 @@ public interface TechnicalSpecificationMapper {
     long queryTechnicalSpecificationCount(PlmTechnicalSpecificationSheetData inData);
 
     List<PlmTechnicalSpecificationSheetData> queryTechnicalSpecificationList(@Param("sql") String sql,@Param("page") int page,@Param("limit") int limit);
+
+    List<ChangeRequestVo> queryChangeLog(PlmTechnicalSpecificationSheetData data);
 }
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 8fa5c712..0a0893d6 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
@@ -1640,4 +1640,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         }
         return mainData;
     }
+
+    @Override
+    public List<ChangeRequestVo> queryChangeLog(PlmTechnicalSpecificationSheetData data) {
+        return technicalSpecificationMapper.queryChangeLog(data);
+    }
 }
diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
index e01aca70..6acb2b23 100644
--- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
+++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
@@ -4,6 +4,7 @@ import com.spring.common.utils.PageUtils;
 import com.spring.modules.base.data.PlmBmModelHeaderData;
 import com.spring.modules.base.data.PlmBmPropertiesValueData;
 import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData;
+import com.spring.modules.change.vo.ChangeRequestVo;
 import com.spring.modules.part.entity.BomDetailEntity;
 import com.spring.modules.part.entity.RoutingDetailEntity;
 import com.spring.modules.part.vo.*;
@@ -978,4 +979,6 @@ public interface TechnicalSpecificationService {
 
 
     void copyBm (PlmTechnicalSpecificationSheetData data);
+
+    List<ChangeRequestVo> queryChangeLog(PlmTechnicalSpecificationSheetData data);
 }
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index dd4d4613..62ed24ee 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -1515,12 +1515,11 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
             </if>
             <if test="customerDesc != null and customerDesc != ''">
                 AND (
-                dbo.plm_get_customer_desc(c.site, c.customer_id) like #{customerDesc} or
-                dbo.plm_get_dictDataLabel('finalCustomer', c.final_customer_id, c.site) like #{customerDesc}
-                )
+                dbo.plm_get_customer_desc(c.site, c.customer_id) like #{customerDesc})
             </if>
             <if test="statusDesc != null and statusDesc != ''">
-                AND dbo.plm_get_technicalBaseDesc(a.status, 'status') like #{statusDesc}
+<!--                AND dbo.plm_get_technicalBaseDesc(a.status, 'status') like #{statusDesc}-->
+                and a.status = #{statusDesc}
             </if>
             <if test="buNo == null || buNo == ''">
                 AND b.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(#{site}, #{userName}))
@@ -1598,4 +1597,50 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
             resultType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData">
         EXEC dbo.getTechnicalSpecificationPageWithSql #{sql}, #{page}, #{limit}
     </select>
+
+    <select id="queryChangeLog" resultType="com.spring.modules.change.vo.ChangeRequestVo">
+        SELECT a.site,
+               a.bu_no,
+               a.change_no,
+               a.applicant_id,
+               dbo.get_userDisPlay(a.applicant_id)              as applicantName,
+               b.department_no                                  as applicationDepartmentId,
+               dbo.get_department_name(a.site, b.department_no) as applicationDepartmentName,
+               a.apply_date,
+               a.ecn_type,
+               a.change_impact,
+               a.change_impact_desc,
+               a.ecn_stage,
+               a.change_type,
+               a.tp_engineer_id,
+               dbo.get_userDisPlay(a.tp_engineer_id)            as tpEngineerName,
+               a.change_phase_in_date,
+               a.df_is_product,
+               a.printing,
+               a.manufacturing_cost_is_change,
+               a.change_request_desc,
+               a.is_re_quote,
+               a.ul_certification_requirements,
+               a.ul_continue_to_meet_demand,
+               a.gp_certification_requirements,
+               a.gp_continue_to_meet_demand,
+               a.create_date,
+               a.create_by,
+               a.update_date,
+               a.update_by,
+               a.industrial_engineer_id,
+               dbo.get_userDisPlay(a.industrial_engineer_id)    as industrialEngineerName,
+               a.change_status,
+               a.cqc_operator_id,
+               dbo.get_userDisPlay(a.cqc_operator_id)           as cqcOperatorName,
+               a.fai_operator_id,
+               dbo.get_userDisPlay(a.fai_operator_id)           as faiOperatorName,
+               a.step_id,
+               a.reject_flag,
+               a.reject_step_id
+        FROM plm_change_request a
+                 LEFT JOIN sys_user as b on a.site = b.site and a.applicant_id = b.username
+                 left join plm_change_request_detail pcrd on a.site = pcrd.site and a.change_no = pcrd.change_no
+        where a.site = #{site} and  pcrd.code_no = #{codeNo}
+    </select>
 </mapper>
\ No newline at end of file