From cec8c8fbf7b4ff8cbc376ecdd27b368cacd8ffde Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 2 Jul 2026 17:41:00 +0800 Subject: [PATCH] =?UTF-8?q?2026-07-02=20=E6=A3=80=E9=AA=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gaotao/modules/pms/data/QcFAIRecordData.java | 4 ++-- src/main/resources/mapper/pms/QcMapper.xml | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java index 421389a..2482756 100644 --- a/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java +++ b/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java @@ -32,8 +32,8 @@ public class QcFAIRecordData extends QueryPage { // 检验结果 private String inspectionResult; // 送检日期 - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date taskDate; private String controlMes; diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index b12d523..d4ab72f 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -732,8 +732,7 @@ unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL}, pass_qty = #{passQty,jdbcType=DECIMAL}, not_pass_qty = #{notPassQty,jdbcType=DECIMAL}, - batch_qualified_qty = #{batchQualifiedQty,jdbcType=DECIMAL}, - submit_date = getDate() + batch_qualified_qty = #{batchQualifiedQty,jdbcType=DECIMAL} WHERE site = #{site} and inspection_no = #{inspectionNo} and bu_no = #{buNo} @@ -1163,8 +1162,7 @@ unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL}, pass_qty = #{passQty,jdbcType=DECIMAL}, not_pass_qty = #{notPassQty,jdbcType=DECIMAL}, - batch_qualified_qty = #{batchQualifiedQty,jdbcType=DECIMAL}, - submit_date = getDate() + batch_qualified_qty = #{batchQualifiedQty,jdbcType=DECIMAL} WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo} @@ -1567,8 +1565,7 @@ unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL}, pass_qty = #{passQty,jdbcType=DECIMAL}, not_pass_qty = #{notPassQty,jdbcType=DECIMAL}, - batch_qualified_qty = #{batchQualifiedQty,jdbcType=DECIMAL}, - submit_date = getDate() + batch_qualified_qty = #{batchQualifiedQty,jdbcType=DECIMAL} WHERE site = #{site} and inspection_no = #{inspectionNo} and bu_no = #{buNo}