ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 新增标准法规处理

Browse Source
This commit is contained in:
liao
2023-09-22 13:36:12 +08:00
parent 00d44c155a
commit 64434ad92e
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+16 -4
View File
@@ -477,7 +477,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
// 新增数据值
StringBuilder valuesBuilder = new StringBuilder();
// 对默认的字段赋值
getCommonInsertValue(fieldsBuilder, valuesBuilder);
String id = getCommonInsertValue(fieldsBuilder, valuesBuilder);
// 拼接要添加的数据
for (Map.Entry<String, Object> 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<LawsTag> 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;
}
/**
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
+2
View File
@@ -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;
/**
laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java
+1 -1
View File
@@ -32,7 +32,7 @@ public interface ILawsNodeRelationService extends IService<LawsNodeRelation> {
* @Date: 2023/9/13 10:52
* @Description: 新增标准时添加体系关联
**/
void addRelation(String nodeIds, String standardNumber);
void addRelation(String nodeIds, String standardNumber, String standardId);
/**
* @Author: liao
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java
+10 -6
View File
@@ -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<LawsNodeRelationMap
* @Description: 新增标准时添加体系关联
**/
@Override
public void addRelation(String nodeIds, String standardNumber) {
// 根据standardNumber查询标准id
ManyStandardSelectionBox singleStandard = lawsCommonService.getSingleStandard(standardNumber);
String standardId = singleStandard.getId();
public void addRelation(String nodeIds, String standardNumber, String standardId) {
if (StringUtils.isBlank(standardId)) {
// 根据standardNumber查询标准id
ManyStandardSelectionBox singleStandard = lawsCommonService.getSingleStandard(standardNumber);
standardId = singleStandard.getId();
}
List<String> nodeIdList = Arrays.asList(nodeIds.split(","));
// 根据nodeId查询nodeCode
@@ -99,7 +103,7 @@ public class LawsNodeRelationServiceImpl extends ServiceImpl<LawsNodeRelationMap
List<LawsTreeNode> treeNodeList = lawsTreeNodeService.list(queryWrapper);
// 批量添加到数据库
List<LawsNodeRelation> 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<LawsNodeRelationMap
relation.setNodeId(nodeId);
relation.setUniqueRelationFlag(standardId);
relationList.add(relation);
});
}
saveBatch(relationList);
}