2023-10-23，设备和质量修改3

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

@@ -1580,8 +1580,8 @@ public class QcController {
      * @return: com.xujie.sys.common.utils.R
      **/
     @PostMapping(value="/disposalMeasuresSearch")
-    public R disposalMeasuresSearch(){
-        List<QcFAIRecordData> list = qcService.disposalMeasuresSearch();
+    public R disposalMeasuresSearch(@RequestBody QcFAIRecordData data){
+        List<QcFAIRecordData> list = qcService.disposalMeasuresSearch(data);
         return R.ok().put("rows", list);
     }
 }

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

@@ -416,5 +416,5 @@ public interface QcMapper {
 
     List<QcFAIRecordData> getSpecialOperationList(QcFAIRecordData data);
 
-    List<QcFAIRecordData> disposalMeasuresSearch();
+    List<QcFAIRecordData> disposalMeasuresSearch(QcFAIRecordData data);
 }

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

@@ -3134,8 +3134,8 @@ public class QcServiceImpl implements QcService {
      * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
      **/
     @Override
-    public List<QcFAIRecordData> disposalMeasuresSearch() {
-        List<QcFAIRecordData> list = qcMapper.disposalMeasuresSearch();
+    public List<QcFAIRecordData> disposalMeasuresSearch(QcFAIRecordData data) {
+        List<QcFAIRecordData> list = qcMapper.disposalMeasuresSearch(data);
         return list;
     }
 

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

@@ -244,5 +244,5 @@ public interface QcService {
 
     List<QcFAIRecordData> getSpecialOperationList(QcFAIRecordData data);
 
-    List<QcFAIRecordData> disposalMeasuresSearch();
+    List<QcFAIRecordData> disposalMeasuresSearch(QcFAIRecordData data);
 }

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

@@ -2588,11 +2588,16 @@
     </select>
 
     <!-- 获取处置措施列表 -->
-    <select id="disposalMeasuresSearch" resultType="QcFAIRecordData">
+    <select id="disposalMeasuresSearch" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
         SELECT
             id,
             disposal_measures
-        FROM  qc_disposal_measures
+        FROM qc_disposal_measures
+        <where>
+            <if test = "inspectionTypeNo != '101'">
+                inspection_type != 'IPQC'
+            </if>
+        </where>
     </select>
 
 </mapper>