2023-08-17，设备和质量修改

src/main/java/com/xujie/sys/modules/pms/data/EamWorkPlanItemAvailableData.java

@@ -52,9 +52,9 @@ public class EamWorkPlanItemAvailableData {
      *
      */
     private String updateBy;
+    private String objectID;
 
     // 设备编码
-    private String objectID;
 
     public String getObjectID() {
         return objectID;

src/main/java/com/xujie/sys/modules/pms/data/QcItemData.java

@@ -53,8 +53,18 @@ public class QcItemData extends QueryPage {
     private String methodName;
     // 方法备注
     private String methodRemark;
-    // 检验类型
+    // 检验类型编码
     private String inspectionTypeNo;
+    // 检验类型名称
+    private String inspectionTypeName;
+
+    public String getInspectionTypeName() {
+        return inspectionTypeName;
+    }
+
+    public void setInspectionTypeName(String inspectionTypeName) {
+        this.inspectionTypeName = inspectionTypeName;
+    }
 
     public String getInspectionTypeNo() {
         return inspectionTypeNo;

src/main/java/com/xujie/sys/modules/pms/data/QcTemplateData.java

@@ -14,7 +14,6 @@ public class QcTemplateData extends QueryPage {
     private String attributeNo;
     // 属性类别
     private String attributeType;
-
     // 工厂号
     private String site;
     // 模板编码

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -51,8 +51,8 @@ public class QcServiceImpl implements QcService {
      **/
     @Override
     public PageUtils qcMethodSearch(QcMethodData data) {
-        IPage<QcMethodData> List = this.qcMapper.qcMethodSearch(new Page<QcMethodData>(data.getPage(), data.getLimit()), data);
-        return new PageUtils(List);
+        IPage<QcMethodData> list = this.qcMapper.qcMethodSearch(new Page<QcMethodData>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(list);
     }
 
     /**
@@ -128,8 +128,8 @@ public class QcServiceImpl implements QcService {
      **/
     @Override
     public PageUtils qcItemSearch(QcItemData data) {
-        IPage<QcItemData> List = this.qcMapper.qcItemSearch(new Page<QcItemData>(data.getPage(), data.getLimit()), data);
-        return new PageUtils(List);
+        IPage<QcItemData> list = this.qcMapper.qcItemSearch(new Page<QcItemData>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(list);
     }
 
     /**

src/main/resources/mapper/pms/QcMapper.xml

@@ -28,7 +28,7 @@
                 AND qm.method_name LIKE '%' + #{query.methodName} +'%'
             </if>
             <if test="query.inspectionTypeNo != null and query.inspectionTypeNo != ''">
-                AND qm.inspection_type_no LIKE '%' + #{query.inspectionTypeNo} +'%'
+                AND qm.inspection_type_no = #{query.inspectionTypeNo}
             </if>
         </where>
     </select>
@@ -103,16 +103,24 @@
             qm.method_no,
             qm.method_name,
             qm.method_remark,
-            epi.inspection_type_no
+            epi.inspection_type_no,
+            qit.inspection_type_name
         FROM eam_properties_item as epi
         LEFT JOIN qc_method_item as qmi on epi.ItemNo = qmi.ItemNo and epi.site = qmi.site
         LEFT JOIN qc_method as qm on qmi.method_no = qm.method_no and qmi.site = qm.site
+        LEFT JOIN qc_inspection_type as qit on qit.inspection_type_no = epi.inspection_type_no and qit.site = epi.site
         <where>
             epi.site = #{query.site}
             and epi.ItemType = #{query.itemType}
             <if test="query.itemDesc != null and query.itemDesc != ''">
                 AND epi.ItemDesc LIKE '%' + #{query.itemDesc} +'%'
             </if>
+            <if test="query.itemNo != null and query.itemNo != ''">
+                AND epi.ItemNo LIKE '%' + #{query.itemNo} +'%'
+            </if>
+            <if test="query.inspectionTypeNo != null and query.inspectionTypeNo != ''">
+                AND epi.inspection_type_no = #{query.inspectionTypeNo}
+            </if>
         </where>
     </select>
 
@@ -357,12 +365,9 @@
             qt.default_sampling_quantity,
             qt.default_sampling_proportion
         FROM qc_template as qt
-        LEFT JOIN qc_inspection_type as qit
-        ON qt.inspection_type_no = qit.inspection_type_no
-        LEFT JOIN qc_sampling_inspection_level as qsil
-        ON qt.sampling_level_no = qsil.sampling_level_no
-        LEFT JOIN qc_sampling_inspection_programme as qsip
-        ON qt.sampling_programme_no = qsip.sampling_programme_no
+        LEFT JOIN qc_inspection_type as qit on qt.inspection_type_no = qit.inspection_type_no and qt.site = qit.site
+        LEFT JOIN qc_sampling_inspection_level as qsil on qt.sampling_level_no = qsil.sampling_level_no
+        LEFT JOIN qc_sampling_inspection_programme as qsip on qt.sampling_programme_no = qsip.sampling_programme_no
         <where>
             qt.site = #{query.site}
             <if test = "query.templateId != null and query.templateId != ''">