From 64434ad92ebcf72175e9cad3cccf37857956d7d8 Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 22 Sep 2023 13:36:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 20 +++++++++++++++---- .../laws/standard/entity/LawsNewsFeed.java | 2 ++ .../service/ILawsNodeRelationService.java | 2 +- .../impl/LawsNodeRelationServiceImpl.java | 16 +++++++++------ 4 files changed, 29 insertions(+), 11 deletions(-) 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 0c7403a4..c2977149 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 @@ -477,7 +477,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 新增数据值 StringBuilder valuesBuilder = new StringBuilder(); // 对默认的字段赋值 - getCommonInsertValue(fieldsBuilder, valuesBuilder); + String id = getCommonInsertValue(fieldsBuilder, valuesBuilder); // 拼接要添加的数据 for (Map.Entry entryMap : parameterMap.entrySet()) { String key = entryMap.getKey(); @@ -502,7 +502,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { lawsUpdateRecordService.addRecord(standardNumber, content); // 对标准体系做处理 - lawsNodeRelationService.addRelation(standardSystem, standardNumber); + lawsNodeRelationService.addRelation(standardSystem, standardNumber, id); return MessageUtils.getMessage(ResultCommon.OK); } @@ -592,7 +592,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 对标准体系做处理 lawsNodeRelationService.removeByStandardId(id); - lawsNodeRelationService.addRelation(standardSystem, standardNumber); + lawsNodeRelationService.addRelation(standardSystem, standardNumber, id); return MessageUtils.getMessage(ResultCommon.OK); } @@ -1064,6 +1064,17 @@ public class LawsCommonServiceImpl implements ILawsCommonService { valuesBuilder.append("," + setValue(lawsTag.getFieldShowType(), value)); } } + if (FieldCommon.STANDARD_NUMBER.equals(key)) { + List standardNumberList = fieldList.stream().filter(lawsTag -> + FieldCommon.STANDARD_NUMBER.equals(lawsTag.getDbFieldName())).collect(Collectors.toList()); + // 如果新增表单里面没有标准编号，则手动添加 + if (CollectionUtils.isEmpty(standardNumberList)) { + // 拼接新增字段 + fieldsBuilder.append("," + key); + // 对数据值做格式处理 + valuesBuilder.append(",'" + value + "'"); + } + } } /** @@ -1135,7 +1146,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Date: 2023/8/24 9:37 * @Description: 获取新增默认值 **/ - private void getCommonInsertValue(StringBuilder fieldsBuilder, StringBuilder valuesBuilder) { + private String getCommonInsertValue(StringBuilder fieldsBuilder, StringBuilder valuesBuilder) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String id = UUID.randomUUID().toString().replace("-", ""); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -1144,6 +1155,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { + FieldCommon.STR_TO_DATE_PREFIX + sdf.format(new Date()) + FieldCommon.STR_TO_DATE_SUFFIX + ",'" + sysUser.getOrgCode() + "'"; fieldsBuilder.append("id,create_by,create_time,update_by,update_time,org_code"); valuesBuilder.append(commonInsertValues); + return id; } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java index afb4208d..be51b6d0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Value; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; @@ -15,6 +16,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java index 9a6f9379..130a8bfb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java @@ -32,7 +32,7 @@ public interface ILawsNodeRelationService extends IService { * @Date: 2023/9/13 10:52 * @Description: 新增标准时添加体系关联 **/ - void addRelation(String nodeIds, String standardNumber); + void addRelation(String nodeIds, String standardNumber, String standardId); /** * @Author: liao diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java index c8b47d25..50c69202 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java @@ -10,6 +10,7 @@ import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsTreeNodeService; import com.spire.ms.System.Collections.ArrayList; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @@ -87,10 +89,12 @@ public class LawsNodeRelationServiceImpl extends ServiceImpl nodeIdList = Arrays.asList(nodeIds.split(",")); // 根据nodeId查询nodeCode @@ -99,7 +103,7 @@ public class LawsNodeRelationServiceImpl extends ServiceImpl treeNodeList = lawsTreeNodeService.list(queryWrapper); // 批量添加到数据库 List relationList = new ArrayList(); - nodeIdList.forEach(nodeId -> { + for (String nodeId : nodeIdList) { LawsNodeRelation relation = new LawsNodeRelation(); String nodeCode = treeNodeList.stream().filter(treeNode -> nodeId.equals(treeNode.getId())) .map(LawsTreeNode::getNodeCode).collect(Collectors.toList()).get(0); @@ -107,7 +111,7 @@ public class LawsNodeRelationServiceImpl extends ServiceImpl