From c97a34b1203dac1b51ace97678bb7e3021d9f07f Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 25 Apr 2025 10:11:09 +0800
Subject: [PATCH] 2025-04-24

---
 .../TechnicalSpecificationMapper.xml          | 98 +++++++++----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 8b955025..dd07f699 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -70,73 +70,73 @@
         <result column="project_name" property="projectName"/>
     </resultMap>
 
-<select id="technicalSpecificationListSearch"  resultMap="getTechnicalSpecificationSheetData" resultType="PlmTechnicalSpecificationSheetData">
+<select id="technicalSpecificationListSearch" parameterType="PlmTechnicalSpecificationSheetData" resultType="java.util.Map">
     SELECT a.id,
            a.site,
-           a.code_no,
-           a.project_id,
-           a.test_part_no,
+           a.code_no as codeNo,
+           a.project_id as projectId,
+           a.test_part_no as testPartNo,
            a.status,
-           a.rev_no,
-           a.work_center_no,
-           a.ECN_flag,
-           a.ECN_no,
-           a.ori_code_no,
-           a.ECN_address,
+           a.rev_no as revNo,
+           a.work_center_no as workCenterNo,
+           a.ECN_flag as ecnFlag,
+           a.ECN_no as ecnNo,
+           a.ori_code_no as oriCodeNo,
+           a.ECN_address as ecnAddress,
            a.remark,
-           a.create_date,
-           a.create_by,
-           a.update_date,
-           a.update_by,
-           b.final_part_no,
-           b.part_type                                                                     partTypeDesc,
-           b.part_type,
-           b.part_name,
-           b.part_desc,
-           b.part_spec,
-           dbo.plm_get_technicalBaseDesc(a.status, 'status')                               statusDesc,
-           a.proofing_no,
-           b.bu_no,
-           dbo.plm_get_bu_desc(a.site, b.bu_no)                                            buDesc,
-           dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'engineer')           engineer,
-           dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'technician')         technician,
+           a.create_date as createDate,
+           a.create_by as createBy,
+           a.update_date as updateDate,
+           a.update_by as updateBy,
+           b.final_part_no as finalPartNo,
+           b.part_type                                                                   as partTypeDesc,
+           b.part_type as partType,
+           b.part_name as partName,
+           b.part_desc as partDesc,
+           b.part_spec as partSpec,
+           dbo.plm_get_technicalBaseDesc(a.status, 'status')                             as statusDesc,
+           a.proofing_no as proofingNo,
+           b.bu_no as buNo,
+           dbo.plm_get_bu_desc(a.site, b.bu_no)                                          as buDesc,
+           dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'engineer')         as engineer,
+           dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'technician')       as technician,
            process,
-           dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'quotationOfficer')   quotationOfficer,
-           dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'engineer')             engineerNo,
-           dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'technician')           technicianNo,
-           c.customer_Id,
-           a.picture_addess,
+           dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'quotationOfficer') as quotationOfficer,
+           dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'engineer')           as engineerNo,
+           dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'technician')         as technicianNo,
+           c.customer_Id as customerId,
+           a.picture_addess as pictureAddess,
            a.customerPictureChangeRemark,
            a.productionFileComments,
-           a.bom_type,
-           a.eng_chg_level,
-           a.bom_alternative_no,
-           a.routing_type,
-           a.routing_revision,
-           a.routing_alternative_no,
+           a.bom_type as bomType,
+           a.eng_chg_level as engChgLevel,
+           a.bom_alternative_no as bomAlternativeNo,
+           a.routing_type as routingType,
+           a.routing_revision as routingRevision,
+           a.routing_alternative_no as routingAlternativeNo,
            a.pod,
            a.mpOperator,
-           dbo.get_userDisPlay(a.mpOperator)                                               mpOperatorName,
+           dbo.get_userDisPlay(a.mpOperator)                                               as mpOperatorName,
            a.cqcOperator,
-           dbo.get_userDisPlay(a.cqcOperator)                                              cqcOperatorName,
+           dbo.get_userDisPlay(a.cqcOperator)                                              as cqcOperatorName,
            a.faiOperator,
-           dbo.get_userDisPlay(a.faiOperator)                                              faiOperatorName,
+           dbo.get_userDisPlay(a.faiOperator)                                              as faiOperatorName,
            a.peOperater,
-           dbo.get_userDisPlay(a.peOperater)                                               peOperaterName,
+           dbo.get_userDisPlay(a.peOperater)                                               as peOperaterName,
            a.csOperater,
-           dbo.get_userDisPlay(a.csOperater)                                               csOperaterName,
+           dbo.get_userDisPlay(a.csOperater)                                               as csOperaterName,
            dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'dcc')               as dccOperater,
            dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'dcc')            as dccOperaterName,
-           d.is_reject,
-           d.node_id,
-           d.node_name,
-           pcpi.customer_part_no,
+           d.is_reject as isReject,
+           d.node_id as nodeId,
+           d.node_name as nodeName,
+           pcpi.customer_part_no as customerPartNo,
            dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.code_no) as sp,
            a.remarkPage,
            a.rev,
-           a.customer_rev,
-           b.plm_part_no,
-           c.project_name
+           a.customer_rev as customerRev,
+           b.plm_part_no as plmPartNo,
+           c.project_name as projectName
     FROM plm_technical_specification_sheet a
         left join view_Project_final_Part b
                   on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no