diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java
index 1843aa1..de6174b 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java
@@ -111,6 +111,10 @@ public class QcPartAttributeData extends QueryPage {
      */
     private String buDesc;
 
+    private Boolean importFlag;
+
+    private String templateIds;
+
     public String getBu() {
         return bu;
     }
@@ -302,4 +306,20 @@ public class QcPartAttributeData extends QueryPage {
     public void setAttributeNo(String attributeNo) {
         this.attributeNo = attributeNo;
     }
+
+    public Boolean getImportFlag() {
+        return importFlag;
+    }
+
+    public void setImportFlag(Boolean importFlag) {
+        this.importFlag = importFlag;
+    }
+
+    public String getTemplateIds() {
+        return templateIds;
+    }
+
+    public void setTemplateIds(String templateIds) {
+        this.templateIds = templateIds;
+    }
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
index 8bd7525..d98b361 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
@@ -167,6 +167,9 @@ public interface QcMapper {
 
     IPage<QcPartAttributeData> qcPartAttributeSearch(Page<QcPartAttributeData> qcPartAttributeDataPage,@Param("query") QcPartAttributeData data);
 
+    IPage<QcPartAttributeData> qcPartAttributeImportSearch(Page<QcPartAttributeData> qcPartAttributeDataPage,@Param(
+            "query") QcPartAttributeData data);
+
     List<EamObjectData> objectSearch(EamObjectData data);
 
     void qcPartAttributeSave(QcPartAttributeData data);
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 0d122bb..d0df8ab 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -1226,7 +1226,13 @@ public class QcServiceImpl implements QcService {
      **/
     @Override
     public PageUtils qcPartAttributeSearch(QcPartAttributeData data) {
-        IPage<QcPartAttributeData> resultList = this.qcMapper.qcPartAttributeSearch(new Page<QcPartAttributeData>(data.getPage(), data.getLimit()), data);
+        IPage<QcPartAttributeData> resultList;
+        if (data.getImportFlag()){
+            resultList = this.qcMapper.qcPartAttributeImportSearch(new Page<QcPartAttributeData>(data.getPage(),
+                    data.getLimit()), data);
+        } else {
+            resultList = this.qcMapper.qcPartAttributeSearch(new Page<QcPartAttributeData>(data.getPage(), data.getLimit()), data);
+        }
         return new PageUtils(resultList);
     }
 
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index bb75352..32952e6 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -966,7 +966,6 @@
     </delete>
 
     <!-- ================================================= 物料属性设置维护 ================================================= -->
-
     <!-- 查询物料属性 -->
     <select id="qcPartAttributeSearch" parameterType="QcPartAttributeData" resultType="QcPartAttributeData">
         SELECT
@@ -1008,6 +1007,53 @@
         </where>
     </select>
 
+    <select id="qcPartAttributeImportSearch" parameterType="QcPartAttributeData" resultType="QcPartAttributeData">
+        SELECT
+        qa.site,
+        qa.bu_no,
+        dbo.get_bu_desc (qa.site, qa.bu_no) AS buDesc,
+        p.PartNo AS partNo,
+        dbo.Get_Part_DescSpec (qa.site, p.PartNo) AS part_desc,
+        p.FamilyID,
+        p.spec AS FamilyName,
+        p.umid,
+        qa.supplier_no,
+        dbo.qc_get_supplier_name (qa.site, qa.supplier_no) AS supplierDesc,
+        qa.attribute_remark,
+        qa.create_time,
+        qa.create_by,
+        qa.attribute_type,
+        qa.update_date,
+        qa.update_by,
+        qa.exempt_inspection,
+        dbo.get_templateIds_by_partAttribute (
+        qa.attribute_no,
+        qa.site,
+        qa.bu_no
+        ) AS templateIds
+        FROM
+        qc_part_attribute qa
+        LEFT JOIN part p ON qa.attribute_no = p.partNo
+        AND qa.site = p.site
+        <where>
+            qa.site in (select site from eam_access_site where username = #{query.userName})
+            and (qa.site + '-' + qa.bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            and qa.attribute_type = #{query.attributeType}
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( qa.site, qa.bu_no ) = #{query.buDesc}
+            </if>
+            <if test = "query.partNo != null and query.partNo != ''">
+                AND qa.attribute_no LIKE '%' + #{query.partNo}+'%'
+            </if>
+            <if test = "query.partDesc != null and query.partDesc != ''">
+                AND dbo.Get_Part_DescSpec(qa.site, p.PartNo) LIKE '%' + #{query.partDesc}+'%'
+            </if>
+            <if test = "query.familyName != null and query.familyName != ''">
+                AND p.spec LIKE '%' + #{query.familyName}+'%'
+            </if>
+        </where>
+    </select>
+
     <!-- 查询是否已有该物料属性 -->
     <select id="selectPartAttributeByNo" resultType="QcPartAttributeData" parameterType="QcPartAttributeData">
         SELECT
@@ -3888,6 +3934,9 @@
             <if test = "query.inspectionResult != null and query.inspectionResult != ''">
                 AND inspection_result = #{query.inspectionResult}
             </if>
+            <if test = "query.createBy != null and query.createBy != ''">
+                AND create_by LIKE #{query.createBy}
+            </if>
             <if test = "query.partNo != null and query.partNo != ''">
                 AND part_no LIKE #{query.partNo}
             </if>