From 39ac55cea9c03abce36abe8c31ada4c3db6b4113 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 10 Jun 2026 15:13:04 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-10=20RoHs=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/spring/modules/rohs/entity/RohsEntity.java   | 12 ++++++++++++
 .../resources/mapper/request/RequestManageMapper.xml |  6 +++++-
 src/main/resources/mapper/rohs/RohsMapper.xml        |  4 +++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
index 96390e31..6945d10d 100644
--- a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
+++ b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
@@ -184,6 +184,11 @@ public class RohsEntity implements Serializable {
      */
     private String sgsReportNumber;
 
+    /**
+     * RoHS状态
+     */
+    private String rohsStatus;
+
     /**
      * 报告有效期
      */
@@ -191,6 +196,13 @@ public class RohsEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date expiredDate;
 
+    /**
+     * 失效日期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date expiryDate;
+
     /**
      * Fiber报告信息
      */
diff --git a/src/main/resources/mapper/request/RequestManageMapper.xml b/src/main/resources/mapper/request/RequestManageMapper.xml
index b93387a5..32f255b3 100644
--- a/src/main/resources/mapper/request/RequestManageMapper.xml
+++ b/src/main/resources/mapper/request/RequestManageMapper.xml
@@ -275,6 +275,8 @@
         case
             when tbl.name = 'plm_rohs' and col.name = 'valid_until_value' then '有效期数值/Valid Until Value'
             when tbl.name = 'plm_rohs' and col.name = 'valid_until' then '有效期单位/Valid Until Unit'
+            when tbl.name = 'plm_rohs' and col.name = 'rohs_status' then '状态/RoHS Status'
+            when tbl.name = 'plm_rohs' and col.name = 'expiry_date' then '失效日期/Expiry Date'
             else CONVERT(varchar(50), comm.value)
         end AS fieldName
         FROM
@@ -287,7 +289,7 @@
         tbl.name = #{tableId}
         and (
             (CONVERT(varchar(50), comm.value) is not null and CONVERT(varchar(50), comm.value) <![CDATA[<>]]> '')
-            or (tbl.name = 'plm_rohs' and col.name in ('valid_until_value', 'valid_until'))
+            or (tbl.name = 'plm_rohs' and col.name in ('valid_until_value', 'valid_until', 'rohs_status', 'expiry_date'))
         )
         ORDER BY col.column_id
     </select>
@@ -304,6 +306,8 @@
                   case
                       when tbl.name = 'plm_rohs' and col.name = 'valid_until_value' then '有效期数值/Valid Until Value'
                       when tbl.name = 'plm_rohs' and col.name = 'valid_until' then '有效期单位/Valid Until Unit'
+                      when tbl.name = 'plm_rohs' and col.name = 'rohs_status' then '状态/RoHS Status'
+                      when tbl.name = 'plm_rohs' and col.name = 'expiry_date' then '失效日期/Expiry Date'
                       else CONVERT(varchar(50), comm.value)
                   end AS fieldName
               FROM
diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml
index e54b3b8b..72a509e6 100644
--- a/src/main/resources/mapper/rohs/RohsMapper.xml
+++ b/src/main/resources/mapper/rohs/RohsMapper.xml
@@ -36,7 +36,9 @@
         <result column="remark" property="remark" />
         <result column="status" property="status" />
         <result column="sgs_report_number" property="sgsReportNumber" />
+        <result column="rohs_status" property="rohsStatus" />
         <result column="expired_date" property="expiredDate" />
+        <result column="expiry_date" property="expiryDate" />
         <result column="fiber_information" property="fiberInformation" />
         <result column="hsf_standard" property="hsfStandard" />
         <result column="hsf_approver" property="hsfApprover" />
@@ -89,7 +91,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        a.site, a.reference_no, a.applicant, a.application_date, a.process, a.pm, a.planned_mass_production_date, a.color, a.vendor_code, a.vendor_material_code, a.material_classify, a.other_material_classify, a.material_use_for, a.end_customer, a.project_id, a.is_macallan_material, a.need_create_number, a.npd_engineer, a.material_validity_time, a.material_validity_comments, a.need_deviation, a.technical_plan, a.wm_required_spec, a.is_fiber_material, a.material_thickness, a.buyer, a.expect_report_time, a.qualification_documents_needed, a.test_report_including_items, a.remark, a.status, a.sgs_report_number, a.expired_date, a.fiber_information, a.hsf_standard, a.hsf_approver, a.related_people, a.valid_until_value, a.valid_until, a.is_meet_rohs_requirement, a.is_ah_grade, a.hsf_supplier_classification, a.material_desc, a.npd_remark, a.is_same_material_diff_size, a.ifs_part_no, a.comm_group1, a.comm_group2, a.comm_group3, a.create_date, a.create_by, a.update_date, a.update_by, a.step_id, a.reject_flag, a.reject_step_id
+        a.site, a.reference_no, a.applicant, a.application_date, a.process, a.pm, a.planned_mass_production_date, a.color, a.vendor_code, a.vendor_material_code, a.material_classify, a.other_material_classify, a.material_use_for, a.end_customer, a.project_id, a.is_macallan_material, a.need_create_number, a.npd_engineer, a.material_validity_time, a.material_validity_comments, a.need_deviation, a.technical_plan, a.wm_required_spec, a.is_fiber_material, a.material_thickness, a.buyer, a.expect_report_time, a.qualification_documents_needed, a.test_report_including_items, a.remark, a.status, a.sgs_report_number, a.rohs_status, a.expired_date, a.expiry_date, a.fiber_information, a.hsf_standard, a.hsf_approver, a.related_people, a.valid_until_value, a.valid_until, a.is_meet_rohs_requirement, a.is_ah_grade, a.hsf_supplier_classification, a.material_desc, a.npd_remark, a.is_same_material_diff_size, a.ifs_part_no, a.comm_group1, a.comm_group2, a.comm_group3, a.create_date, a.create_by, a.update_date, a.update_by, a.step_id, a.reject_flag, a.reject_step_id
     </sql>
 
     <select id="getApprovalList" resultType="com.spring.modules.change.vo.ProcessFormVo">