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

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

@@ -1571,6 +1571,19 @@ public class QcController {
         List<QcFAIRecordData> list = qcService.getSpecialOperationList(data);
         return R.ok().put("rows", list);
     }
+
+    /**
+     * @description: 获取处置措施列表
+     * @author: fengyuan_yang
+     * @date: 2023/10/23 13:14
+     * @param: []
+     * @return: com.xujie.sys.common.utils.R
+     **/
+    @PostMapping(value="/disposalMeasuresSearch")
+    public R disposalMeasuresSearch(){
+        List<QcFAIRecordData> list = qcService.disposalMeasuresSearch();
+        return R.ok().put("rows", list);
+    }
 }
 
 

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

@@ -9,6 +9,8 @@ import java.util.Date;
 import java.util.List;
 
 public class QcFAIRecordData extends QueryPage {
+    // id
+    private Integer id;
     // 检验单号
     private String inspectionNo;
     // 工厂号
@@ -156,6 +158,14 @@ public class QcFAIRecordData extends QueryPage {
     // 子明细数据数量
     private Integer subDetailRecordNum;
 
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
     public Integer getSubDetailRecordNum() {
         return subDetailRecordNum;
     }

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

@@ -415,4 +415,6 @@ public interface QcMapper {
     List<QcFAIRecordData> getPartInformation(QcFAIRecordData data);
 
     List<QcFAIRecordData> getSpecialOperationList(QcFAIRecordData data);
+
+    List<QcFAIRecordData> disposalMeasuresSearch();
 }

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

@@ -3126,6 +3126,19 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    /**
+     * @description: 获取处置措施列表
+     * @author: fengyuan_yang
+     * @date: 2023/10/23 13:15
+     * @param: []
+     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     **/
+    @Override
+    public List<QcFAIRecordData> disposalMeasuresSearch() {
+        List<QcFAIRecordData> list = qcMapper.disposalMeasuresSearch();
+        return list;
+    }
+
 }
 
 

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

@@ -243,4 +243,6 @@ public interface QcService {
     List<QcFAIRecordData> getPartInformation(QcFAIRecordData data);
 
     List<QcFAIRecordData> getSpecialOperationList(QcFAIRecordData data);
+
+    List<QcFAIRecordData> disposalMeasuresSearch();
 }

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

@@ -2587,6 +2587,14 @@
         where site = #{site}
     </select>
 
+    <!-- 获取处置措施列表 -->
+    <select id="disposalMeasuresSearch" resultType="QcFAIRecordData">
+        SELECT
+            id,
+            disposal_measures
+        FROM  qc_disposal_measures
+    </select>
+
 </mapper>