From 9125ca7cbbaa0d0d00411cd8022d2ba4a0c5eeca Mon Sep 17 00:00:00 2001 From: jh_peng Date: Fri, 25 Oct 2024 15:46:50 +0800 Subject: [PATCH] =?UTF-8?q?V0=20=E7=BB=93=E6=89=B9=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8E=82=E5=95=86=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- log/message.log | 8 ++++++++ repository/report_reader/ft_reader.go | 3 +++ 2 files changed, 11 insertions(+) diff --git a/log/message.log b/log/message.log index e2464f2..a95b452 100644 --- a/log/message.log +++ b/log/message.log @@ -1621,3 +1621,11 @@ 2024-10-25 14:19:05 INFO | 192.168.0.172 | 200 | 690.6µs | POST | 未登录 | /testData/report/fTPassProbabilityByProduct 2024-10-25 14:21:11 INFO | 192.168.0.172 | 200 | 12.1305132s | POST | 未登录 | /testData/report/fTPassProbabilityByProduct 2024-10-25 14:21:27 INFO | 192.168.0.172 | 200 | 2.3926672s | POST | 未登录 | /testData/report/fTPassProbabilityByProduct +2024-10-25 15:38:13 INFO | 192.168.0.172 | 200 | 3.1751ms | GET | 未登录 | /testData/warning?page=1&pageSize=20&key_word= +2024-10-25 15:38:16 INFO | 192.168.0.172 | 200 | 2.9625ms | GET | 未登录 | /testData/finalReport/excel?page=1&pageSize=20&key_word= +2024-10-25 15:38:18 INFO | 192.168.0.172 | 200 | 1.4991ms | GET | 未登录 | /testData/finalReport/excel?page=1&pageSize=20&key_word= +2024-10-25 15:38:25 INFO | 192.168.0.172 | 200 | 2.519ms | GET | 未登录 | /testData/import/testFile/factorySelection +2024-10-25 15:38:45 INFO | 192.168.0.172 | 200 | 2.0585ms | GET | 未登录 | /testData/finalReport/excel?page=1&pageSize=20&key_word= +2024-10-25 15:38:49 INFO | 192.168.0.172 | 200 | 2.2275ms | GET | 未登录 | /testData/finalReport/excel?page=1&pageSize=20&key_word= +2024-10-25 15:38:52 INFO | 192.168.0.172 | 200 | 1.5576ms | GET | 未登录 | /testData/import/testFile/factorySelection +2024-10-25 15:38:58 INFO | 192.168.0.172 | 200 | 1.4621ms | POST | 未登录 | /testData/import/finalReport diff --git a/repository/report_reader/ft_reader.go b/repository/report_reader/ft_reader.go index f3a689d..f6ab217 100644 --- a/repository/report_reader/ft_reader.go +++ b/repository/report_reader/ft_reader.go @@ -413,6 +413,9 @@ func FTEmptyInfoHandler(titleMap map[string]int, finalReportExcel *model.FinalRe if _, ok := titleMap[finalReportExcel.Lot]; !ok { info["lot"] = "" } else if finalReportExcel.Lot != "" { + if strings.Contains(row[titleMap[finalReportExcel.Lot]], "-") { + row[titleMap[finalReportExcel.Lot]] = strings.Split(row[titleMap[finalReportExcel.Lot]], "-")[0] + } info["lot"] = row[titleMap[finalReportExcel.Lot]] } finalReportExcel.TestProgram = strings.ReplaceAll(finalReportExcel.TestProgram, " ", "")