From 642dc6e449709eff2f8a9e3a2231e6173492c6f7 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Mon, 1 Jul 2024 16:02:56 +0800
Subject: [PATCH] =?UTF-8?q?2024.7.1=20=E4=BA=A7=E5=93=81=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/pms/EamProjectMapper.xml          | 4 ++--
 src/main/resources/mapper/pms/ProofingInformationMapper.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml
index 7ffbd2b3..68b06f66 100644
--- a/src/main/resources/mapper/pms/EamProjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamProjectMapper.xml
@@ -17,7 +17,7 @@
     </insert>
     <update id="eamProjectEdit">
         UPDATE plm_project_info
-        SET project_category = #{projectCategory},project_name = #{projectName},project_desc = #{projectDesc},status = #{status},project_source = #{projectSource},customer_no = #{customerNo},priority = #{priority},remark = #{remark},need_date = #{needDate},c_project_region = #{cProjectRegion},project_manager = #{projectManager},project_owner = #{projectOwner},engineer = #{engineer},c_project_build_date = #{cProjectBuildDate},c_quality_engineer1 = #{cQualityEngineer1},c_quality_engineer2 = #{cQualityEngineer2},c_quality_engineer3 = #{cQualityEngineer3},c_manufacture_engineer = #{cManufactureEngineer},project_close_date = #{projectCloseDate},update_date = GETDATE(),update_by = #{updateBy},project_creation_date = #{projectCreationDate}
+        SET project_category = #{projectCategory},project_name = #{projectName},project_desc = #{projectDesc},status = #{status},project_source = #{projectSource},customer_no = #{customerNo},priority = #{priority},remark = #{remark},need_date = #{needDate},c_project_region = #{cProjectRegion},project_manager = #{projectManager},project_owner = #{projectOwner},engineer = #{engineer},c_quality_engineer1 = #{cQualityEngineer1},c_quality_engineer2 = #{cQualityEngineer2},c_quality_engineer3 = #{cQualityEngineer3},c_manufacture_engineer = #{cManufactureEngineer},update_date = GETDATE(),update_by = #{updateBy},project_creation_date = #{projectCreationDate}
         WHERE site = #{site} and project_id = #{projectId}
     </update>
     <update id="eamProjectPartEdit">
@@ -85,7 +85,7 @@
             AND #{query.endDate} >= a.project_creation_date
         </if>
         </where>
-
+        order by a.project_creation_date desc
     </select>
     <select id="checkeamProject" resultType="com.xujie.sys.modules.pms.data.EamProjectInfoData">
         SELECT
diff --git a/src/main/resources/mapper/pms/ProofingInformationMapper.xml b/src/main/resources/mapper/pms/ProofingInformationMapper.xml
index b7c5900d..21236799 100644
--- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml
+++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml
@@ -5,9 +5,9 @@
 <mapper namespace="com.xujie.sys.modules.pms.mapper.ProofingInformationMapper">
     <insert id="proofingInformationSave">
         INSERT INTO plm_proofing_information
-        (site,proofing_no,project_id,test_part_no,customer_no,tracker,engineer,priority_level,proofing_number,plan_start_date,required_delivery_date,remark,technical_considerations,is_need_to_send_samples,send_samples_address,consignee,consignee_contact,actuality_delivery_date,proofing_result_information,actuality_send_samples_date,send_samples_method,deliver_goods_information,deliver_goods_remark,actuality_reply_date,confirm_results,confirm_by,confirm_information,proofing_status,proofing_result_status,next_to_do,create_date,create_by,update_date,update_by,approver,step_id,reject_flag,reject_step_id,c_project_type_db,project_phase)
+        (site,proofing_no,project_id,test_part_no,customer_no,tracker,engineer,priority_level,proofing_number,plan_start_date,required_delivery_date,remark,technical_considerations,is_need_to_send_samples,send_samples_address,consignee,consignee_contact,proofing_result_information,actuality_send_samples_date,send_samples_method,deliver_goods_information,deliver_goods_remark,actuality_reply_date,confirm_results,confirm_by,confirm_information,proofing_status,proofing_result_status,next_to_do,create_date,create_by,update_date,update_by,approver,step_id,reject_flag,reject_step_id,c_project_type_db,project_phase)
         VALUES
-        (#{site},#{proofingNo},#{projectId},#{testPartNo},#{customerNo},#{tracker},#{engineer},#{priorityLevel},#{proofingNumber},#{planStartDate},#{requiredDeliveryDate},#{remark},#{technicalConsiderations},#{isNeedToSendSamples},#{sendSamplesAddress},#{consignee},#{consigneeContact},#{actualityDeliveryDate},#{proofingResultInformation},#{actualitySendSamplesDate},#{sendSamplesMethod},#{deliverGoodsInformation},#{deliverGoodsRemark},#{actualityReplyDate},#{confirmResults},#{confirmBy},#{confirmInformation},#{proofingStatus},#{proofingResultStatus},#{nextToDo},getDate(),#{createBy},getDate(),#{updateBy},#{approver},#{stepId},#{rejectFlag},#{rejectStepId},#{cProjectTypeDb},#{projectPhase})
+        (#{site},#{proofingNo},#{projectId},#{testPartNo},#{customerNo},#{tracker},#{engineer},#{priorityLevel},#{proofingNumber},#{planStartDate},#{requiredDeliveryDate},#{remark},#{technicalConsiderations},#{isNeedToSendSamples},#{sendSamplesAddress},#{consignee},#{consigneeContact},#{proofingResultInformation},#{actualitySendSamplesDate},#{sendSamplesMethod},#{deliverGoodsInformation},#{deliverGoodsRemark},#{actualityReplyDate},#{confirmResults},#{confirmBy},#{confirmInformation},#{proofingStatus},#{proofingResultStatus},#{nextToDo},getDate(),#{createBy},getDate(),#{updateBy},#{approver},#{stepId},#{rejectFlag},#{rejectStepId},#{cProjectTypeDb},#{projectPhase})
     </insert>
 
     <select id="proofingInformationSearch" resultType="com.xujie.sys.modules.pms.data.ProofingInformationData">