From bb7ec04a388061cf797ff3ff3204a7e5b59c84f3 Mon Sep 17 00:00:00 2001 From: tangwei Date: Thu, 20 Aug 2026 12:26:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9E=82=E5=90=91=E6=B0=B4=E6=B8=A9?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wt/service/impl/SdWtvtRServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtvtRServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtvtRServiceImpl.java index e6631b27..a185a842 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtvtRServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtvtRServiceImpl.java @@ -252,7 +252,7 @@ public class SdWtvtRServiceImpl extends ServiceImpl } batchUpdateWtvtRData(dataList); if (CollUtil.isNotEmpty(logDetails)) { - MsOperationLog mainLog = buildWtvtMainLog( stcd,"修改垂向水温数据", source); + MsOperationLog mainLog = buildWtvtMainLog( stcd,"修改垂向水温数据", source,"02"); msOperationLogMapper.insert(mainLog); for (MsOperationLogDetail detail : logDetails) { detail.setMainId(mainLog.getId()); @@ -438,12 +438,12 @@ public class SdWtvtRServiceImpl extends ServiceImpl List params = new ArrayList<>(); List conditions = new ArrayList<>(); for (DataParam item : dataParamList) { - if (item == null || StringUtils.isBlank(item.getId()) || StringUtils.isBlank(item.getDt())) { + if (item == null || StringUtils.isBlank(item.getId()) || StringUtils.isBlank(item.getTm())) { continue; } conditions.add("(STCD = ? AND TM = TO_DATE(SUBSTR(?, 1, 19), 'YYYY-MM-DD HH24:MI:SS'))"); params.add(item.getId()); - params.add(item.getDt()); + params.add(item.getTm()); } if (conditions.isEmpty()) { return new ArrayList<>(); @@ -487,12 +487,13 @@ public class SdWtvtRServiceImpl extends ServiceImpl if (CollUtil.isEmpty(rows)) { return; } - MsOperationLog mainLog = buildWtvtMainLog(null,remark, source); - msOperationLogMapper.insert(mainLog); List details = new ArrayList<>(); for (Map row : rows) { String stcd = asString(row.get("STCD")); +// String recordId = asString(row.get("ID")); Object depth = row.get("WTHG"); + MsOperationLog mainLog = buildWtvtMainLog(stcd, remark, source, "03"); + msOperationLogMapper.insert(mainLog); for (Map.Entry entry : row.entrySet()) { String fieldCode = entry.getKey(); Object oldValue = entry.getValue(); @@ -507,11 +508,12 @@ public class SdWtvtRServiceImpl extends ServiceImpl batchInsertWtvtLogDetails(details); } - private MsOperationLog buildWtvtMainLog(String recordId,String remark, String source) { + private MsOperationLog buildWtvtMainLog(String recordId,String remark, String source,String operationType) { MsOperationLog log = new MsOperationLog(); log.setOperator(resolveWtvtLogOperator()); log.setOperateTime(new Date()); log.setTableName(WT_CX_TABLE_NAME); + log.setOperationType(operationType); log.setRecordId(recordId); log.setSource(StringUtils.trimToNull(source)); log.setRemark(remark);