From 303ecdb66b39cfdc63ef78a9b8bd6c091c970a0a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 6 Nov 2024 11:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/quality/domain/CheckTypeXJDetail.java  | 4 +++-
 .../java/com/op/quality/mapper/QcStaticTableMapper.java     | 1 +
 .../op/quality/service/impl/QcStaticTableServiceImpl.java   | 4 ++--
 .../main/resources/mapper/quality/QcStaticTableMapper.xml   | 6 ++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/CheckTypeXJDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/CheckTypeXJDetail.java
index d8448d3d..5ddb1f3b 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/CheckTypeXJDetail.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/CheckTypeXJDetail.java
@@ -35,7 +35,7 @@ public class CheckTypeXJDetail extends BaseEntity {
     @Excel(name = "生产时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private String incomeTimeStr;
-    @Excel(name = "班次")
+    @Excel(name = "班次", readConverterExp = "5=白班,2=夜班,9=中班")
     private String shiftId;
     @Excel(name = "线体名称")
     private String equipmentName;
@@ -44,6 +44,8 @@ public class CheckTypeXJDetail extends BaseEntity {
     @Excel(name = "检验时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String checkTime;
+//    @Excel(name = "检测状态", readConverterExp = "0=待检测,1=检测中,2=检测完成")
+//    private String checkStatus;
 
     public String getWorkorderCodeSap() {
         return workorderCodeSap;
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 96637ab3..c7ecf8de 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
@@ -55,6 +55,7 @@ public interface QcStaticTableMapper {
     Map<String, QcStaticTable> getProjectDetailNight(QcStaticTable qcStaticTable);
 
     List<String> getBatchnos(String orderNo);
+    List<String> getCheckBatchnos(String orderNo);
 
     List<QcStaticTable> getLegendData(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 42b1db9a..f64c1a4f 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
@@ -296,7 +296,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
     public List<QcStaticTable> getXJCheckTableList(QcStaticTable qcStaticTable) {
         List<QcStaticTable> tabledtos = qcStaticTableMapper.getXJCheckTableList(qcStaticTable);
         for (QcStaticTable tabledto : tabledtos) {
-            List<String> batchnos = qcStaticTableMapper.getBatchnos(tabledto.getOrderNo());
+            List<String> batchnos = qcStaticTableMapper.getCheckBatchnos(tabledto.getOrderNo());
             String ordernoStr = "";
             for (String batchno : batchnos) {
                 ordernoStr += batchno + ";";
@@ -1317,7 +1317,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
                         List<String> actArray0 = Arrays.asList(actArrayStr.split(","));
                         List<String> actArray = new ArrayList<>();
                         for(String avg:actArray0){
-                            if(avg.matches(".*\\..*\\..*")){
+                            if(avg.matches(".*\\..*\\..*")||avg.indexOf(":")>0){
                                 actArray.add(avg.substring(2));
                             }else{
                                 actArray.add(avg);
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 d1b7a6e8..e6392130 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
@@ -290,6 +290,12 @@
 		  and pow.workorder_code = #{orderNo}
           order by powb.batch_code
 	</select>
+    <select id="getCheckBatchnos" resultType="java.lang.String">
+          select qct.income_batch_no from qc_check_task qct
+          where qct.check_type = 'checkTypeSCXJ'
+            and qct.del_flag = '0' and qct.order_no = #{orderNo} and qct.income_batch_no is not null
+    </select>
+
     <select id="getLegendData" resultType="com.op.quality.domain.QcStaticTable">
 		select DISTINCT supplier_code supplierCode,
 		                supplier_name supplierName