From 39b63b4346f531fe5692b19f0d8c19ecee69e62d Mon Sep 17 00:00:00 2001 From: liao Date: Tue, 19 Sep 2023 15:39:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=97=A5=E5=BF=97=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/common/constant/FieldCommon.java | 9 +++++++++ .../service/impl/LawsCommonServiceImpl.java | 15 +++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index 9983fb7f..63b71c2c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -39,6 +39,15 @@ public class FieldCommon { LawsFieldTypeEnum.TREE_BOX_SINGLE.getValue() // 树型单选 ); + // 特殊更新记录字段 + public static final List SPECIFIC_UPDATE_FIELD = Arrays.asList( + "standard_system", + "substitute_standard_number", + "replaced_by_standard_number", + "reference_standard", + "referenced_standard" + ); + public static final String MODULE = "module"; // 表名标识 public static final String ORDER_BY = "orderBy"; // 升序还是倒序标识 public static final String ORDER_BY_FIELD = "orderByField"; // 排序字段 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index d07b2192..8ee87695 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -457,7 +457,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { List fieldList = lawsCommonMapper.getFieldList(tableName); // 筛选出表单显示的 fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getInteger() - .equals(lawsTag.getIsShowForm())).collect(Collectors.toList()); + .equals(lawsTag.getIsShowFormCreate())).collect(Collectors.toList()); // 更新语句 StringBuilder updateBuilder = new StringBuilder(); // 拼接默认的更新语句 @@ -529,13 +529,20 @@ public class LawsCommonServiceImpl implements ILawsCommonService { **/ private void addUpdateRecord(List fieldList, Map oldDataMap, StringBuilder recordBuffer, String key, String value) { + if (FieldCommon.SPECIFIC_UPDATE_FIELD.contains(key)) { + // 特殊更新字段处理 + return; + } String oldValue = ""; if (!Objects.isNull(oldDataMap.get(key))) oldValue = oldDataMap.get(key).toString(); // 如果新旧值不一样 if (!oldValue.equals(value)) { - String name = fieldList.stream().filter(lawsTag -> key.equals(lawsTag.getDbFieldName())) - .map(LawsTag::getDbFieldTxt).collect(Collectors.toList()).get(0); - recordBuffer.append(FieldCommon.QUOTE + name + FieldCommon.QUOTE + "由"); + List nameList = fieldList.stream().filter(lawsTag -> key.equals(lawsTag.getDbFieldName())) + .map(LawsTag::getDbFieldTxt).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(nameList)) { + return; + } + recordBuffer.append(FieldCommon.QUOTE + nameList.get(0) + FieldCommon.QUOTE + "由"); recordBuffer.append(FieldCommon.QUOTE + oldValue + FieldCommon.QUOTE + "改为"); recordBuffer.append(FieldCommon.QUOTE + value + FieldCommon.QUOTE + "；"); }