From 18cbab3c497ea13d2fc2eb202a41ac1561dd6414 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 15 Aug 2024 00:10:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=96=B0=E5=A2=9E=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/QcStaticTableController.java    |  9 ++++++++-
 .../com/op/quality/domain/QcStaticTable.java   | 18 ++++++++++++++++++
 .../op/quality/mapper/QcStaticTableMapper.java |  4 ++++
 .../service/impl/QcStaticTableServiceImpl.java | 17 +++++++++++++++++
 .../mapper/quality/QcStaticTableMapper.xml     |  8 ++++++++
 5 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
index 16fd477a..1afabfbe 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
@@ -487,5 +487,12 @@ public class QcStaticTableController extends BaseController {
             }
         }
     }
-
+    /**
+     * 定量值分析--表头--产品名称
+     **/
+    @GetMapping("/getTableHzTitle")
+    @Log(title = "检验分类汇总", businessType = BusinessType.QUERY)
+    public QcStaticTable getTableHzTitle(QcStaticTable qcStaticTable) {
+        return qcStaticTableService.getTableHzTitle(qcStaticTable);
+    }
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
index a3618395..87f6447d 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
@@ -110,6 +110,24 @@ public class QcStaticTable extends BaseEntity {
     private String[] projectNoArray;
     private BigDecimal upperDiff;
     private BigDecimal downDiff;
+    private List<String> columns1;
+    private List<String> columns2;
+
+    public List<String> getColumns1() {
+        return columns1;
+    }
+
+    public void setColumns1(List<String> columns1) {
+        this.columns1 = columns1;
+    }
+
+    public List<String> getColumns2() {
+        return columns2;
+    }
+
+    public void setColumns2(List<String> columns2) {
+        this.columns2 = columns2;
+    }
 
     public String getIncomeTimeStr() {
         return incomeTimeStr;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
index 5de6c48b..9707784a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
@@ -81,4 +81,8 @@ public interface QcStaticTableMapper {
     QcStaticTable getUpAndDown(QcStaticTable qcStaticTable);
     @MapKey("detailId")
     Map<String, QcStaticTable> defectMap(QcStaticTable qcStaticTable);
+
+    List<String> getTableHzTitle(QcStaticTable qcStaticTable);
+
+    List<String> getTableHzTitle2(QcStaticTable qcStaticTable);
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
index 75131a86..00430ee2 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
@@ -783,6 +783,23 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
         return qcStaticTableMapper.getProjectList(checkType);
     }
 
+    @Override
+    @DS("#header.poolName")
+    public QcStaticTable getTableHzTitle(QcStaticTable qcStaticTable) {
+        QcStaticTable dto = new QcStaticTable();
+        qcStaticTable.setDataType("unqualified_remark");
+        qcStaticTable.setRemark("checkTypeCP");
+        List<String> cols1 = qcStaticTableMapper.getTableHzTitle(qcStaticTable);
+        if(CollectionUtils.isEmpty(cols1)){
+            return dto;
+        }
+        dto.setColumns1(cols1);
+        List<String> cols2 = qcStaticTableMapper.getTableHzTitle2(qcStaticTable);
+
+        dto.setColumns2(cols2);
+        return dto;
+    }
+
     private List<String> getHourProductionTitle(QcStaticTable qcStaticTable) {
 
         // 返回的日期集合
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
index 88166b58..2a64281d 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
@@ -490,4 +490,12 @@
         where qctd.del_flag = '0' and qct.order_no = #{orderNo}
         GROUP by qctd.belong_to,qctd.belong_to_detail
     </select>
+    <select id="getTableHzTitle" resultType="java.lang.String">
+        select dict_label from base_dict_data
+        where dict_type = #{dataType}
+          and remark = #{remark} order by dict_sort
+    </select>
+    <select id="getTableHzTitle2" resultType="java.lang.String">
+        select defect_subclass from qc_defect_type where defect_type = #{typeCode} and del_flag = '0'
+    </select>
 </mapper>