质量新增报表

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);
+    }
 }

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;

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);
 }

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) {
 
         // 返回的日期集合

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>