2023-12-13 查询增加筛选

src/main/java/com/xujie/sys/modules/pms/controller/QcController.java

@@ -1701,6 +1701,17 @@ public class QcController {
         Map<String, Integer> countMap = qcService.subDetailUpload(file, data);
         return R.ok().put("countMap", countMap);
     }
+
+    /**
+     * 获取检验方法列表
+     * @param data
+     * @return
+     */
+    @PostMapping("/queryMethodList")
+    public R queryMethodList(@RequestBody QcMethodData data) {
+        List<QcMethodData> list = qcService.queryMethodList(data);
+        return R.ok().put("rows", list);
+    }
 }
 
 

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -440,4 +440,6 @@ public interface QcMapper {
     void deleteIPQCRecordCount(QcFAIRecordData qcData);
 
     List<QcTemplateData> getItem(QcTemplateData data);
+
+    List<QcMethodData> queryMethodList(QcMethodData data);
 }

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

@@ -582,6 +582,17 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    /**
+     * 获取检验方法列表
+     * @param data
+     * @return
+     */
+    @Override
+    public List<QcMethodData> queryMethodList(QcMethodData data) {
+        List<QcMethodData> list = qcMapper.queryMethodList(data);
+        return list;
+    }
+
     /**
      * @description: 删除项目
      * @author: fengyuan_yang

src/main/java/com/xujie/sys/modules/pms/service/QcService.java

@@ -264,4 +264,6 @@ public interface QcService {
     Map<String, Integer> subDetailUpload(MultipartFile file, GetParamInData data);
 
     List<QcTemplateData> getItem(QcTemplateData data);
+
+    List<QcMethodData> queryMethodList(QcMethodData data);
 }

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

@@ -1089,7 +1089,7 @@
         qt.template_name,
         qit.inspection_type_name
         FROM qc_template as qt
-        LEFT JOIN qc_inspection_type AS qit ON qt.inspection_type_no  = qit.inspection_type_no
+        LEFT JOIN qc_inspection_type AS qit ON qt.inspection_type_no  = qit.inspection_type_no and qt.site = qit.site
         <where>
             qt.site = #{site}
             <if test = "inspectionTypeNo != null and inspectionTypeNo != ''">
@@ -2868,6 +2868,29 @@
         WHERE site = #{site} and inspection_no = #{inspectionNo} and item_no = #{itemNo}
     </select>
 
+    <!-- 查询检验方法列表 -->
+    <select id="queryMethodList" resultType="QcMethodData" parameterType="QcMethodData">
+        SELECT
+            site,
+            method_no,
+            method_name,
+            inspection_type_no,
+            dbo.qc_get_inspection_type_name(site, inspection_type_no) as inspectionTypeName
+        FROM qc_method
+        <where>
+            site = #{site}
+            <if test = "methodNo != null and methodNo != ''">
+                AND method_no LIKE '%' + #{methodNo} + '%'
+            </if>
+            <if test = "methodName != null and methodName != ''">
+                AND method_name LIKE '%' + #{methodName} + '%'
+            </if>
+            <if test = "inspectionTypeNo != null and inspectionTypeNo != ''">
+                AND inspection_type_no = #{inspectionTypeNo}
+            </if>
+        </where>
+    </select>
+
 </mapper>