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} - 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} AND a.ObjectID = #{objectID} + ORDER BY b.order_id