From 85f6c33218b62079a7af9c895ac908b65a6cec71 Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Wed, 4 Jun 2025 18:15:12 +0800
Subject: [PATCH] =?UTF-8?q?2025.06.04=201=E3=80=81=09=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9A100613=20=20=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=20=20=20=20=20=20=20=20=20=20=20=E7=9B=AE=E5=89=8D?=
 =?UTF-8?q?=E6=8D=A2=E7=BA=BF=E4=B8=93=E5=AE=B6=E7=BB=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E3=80=81=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E7=BB=84=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E9=83=BD=E6=9C=89?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=202?=
 =?UTF-8?q?=E3=80=81=09=E9=97=AE=E9=A2=98=E7=BC=96=E5=8F=B7=EF=BC=9A200029?=
 =?UTF-8?q?=20=20=E9=97=AE=E9=A2=98=E6=8F=8F=E8=BF=B0=EF=BC=9A=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=9D=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=9D=E9=A1=B9=E7=9B=AE=E5=8F=AF=E4=BB=A5=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BF=9D=E5=85=BB?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=20=E7=BB=B4=E4=BF=9D=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E7=BB=B4=E4=BF=9D=E9=A1=B9=E7=9B=AE=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E4=B8=8D=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E7=82=B9=E6=A3=80=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E7=82=B9=E6=A3=80=E9=A1=B9=E7=9B=AE=E5=90=8C?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=8F=82=E8=80=83QMS?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=A3=80=E9=AA=8C=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xujie/sys/modules/pms/data/EamWorkPlanData.java    | 10 ++++++++++
 src/main/resources/mapper/pms/EamMapper.xml            |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkPlanData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkPlanData.java
index 4adcc9db..584f8948 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkPlanData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkPlanData.java
@@ -350,5 +350,15 @@ public class EamWorkPlanData extends QueryPage {
     public void setTaskStartDate(Date taskStartDate) {
         this.taskStartDate = taskStartDate;
     }
+
+    private String codeNo;
+
+    public String getCodeNo() {
+        return codeNo;
+    }
+
+    public void setCodeNo(String codeNo) {
+        this.codeNo = codeNo;
+    }
 }
 
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 7369cbd3..d4f8cbe5 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -628,12 +628,15 @@
              a.CreatedBy,
              a.ObjectID
           FROM eam_workPlan_item a
+          left join eam_properties_model_detail b on a.Site = b.site and a.ItemType = b.function_type and a.ItemNo =
+        b.properties_item_no and a.bu_no = b.bu_no and b.code_no = #{codeNo}
         <where>
-            a.PlanID = #{planID} and a.Site = #{site} and a.ItemType = #{functionType} and bu_no = #{buNo}
+            a.PlanID = #{planID} and a.Site = #{site} and a.ItemType = #{functionType} and a.bu_no = #{buNo}
             <if test = "objectID != null and objectID != ''">
                 AND a.ObjectID = #{objectID}
             </if>
         </where>
+        ORDER BY b.order_id
     </select>
 
     <select id="searchPlanItemAvailable" resultType="com.xujie.sys.modules.pms.data.EamWorkPlanItemAvailableData">