|
|
@@ -128,10 +128,11 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
|
|
|
|
|
|
//获取实体表主库信息
|
|
|
TableInfo tableInfo = tableInfoMapper.selectById(wbsFormElement.getFId());
|
|
|
- if(tableInfo==null){
|
|
|
+ if (tableInfo == null) {
|
|
|
throw new ServiceException("没有找到主库信息,确认fid是否正确");
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
tableName = tableInfo.getTabEnName();
|
|
|
+
|
|
|
}
|
|
|
//获取当前表单下所有元素
|
|
|
List<WbsFormElement> wbsFormElements = baseMapper.selectList(Wrappers.<WbsFormElement>query().lambda().eq(WbsFormElement::getFId, wbsFormElement.getFId()));
|
|
|
@@ -385,94 +386,174 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public boolean submitExcelRelationWbsTreeAndElement(FormElementDTO2 formElementDTO) {
|
|
|
- //新增元素表、实体表
|
|
|
-
|
|
|
- if (formElementDTO.getSubmitStatus() == 2 || formElementDTO.getSubmitStatus() == 3) {
|
|
|
+ //新增元素表、实体表 2表示 创建 并关联 wbs 树节点信息 3 表示只创建
|
|
|
+ if (formElementDTO.getSubmitStatus() == 2 || formElementDTO.getSubmitStatus() == 3) {//
|
|
|
this.saveFormElement(formElementDTO);
|
|
|
- }else if (formElementDTO.getSubmitStatus() == 1) {
|
|
|
- if (formElementDTO.getElementList().size() <= 0) {
|
|
|
- throw new ServiceException("请添加至少一个元素信息");
|
|
|
- }
|
|
|
- //关联-在已有元素表中新增元素,在实体表中追加字段
|
|
|
- //获取当前清表关联的所有tableIds
|
|
|
- List<WbsTabRelationExcelTab> WbsTabRelationExcelTabs = baseMapper.selectWbsTabRelationExcelTab(null, String.valueOf(formElementDTO.getExcelTabId()));
|
|
|
- List<Long> tableIds = WbsTabRelationExcelTabs.stream().map(WbsTabRelationExcelTab::getWbsTabId).collect(Collectors.toList());
|
|
|
- if (tableIds.size() == 0) {
|
|
|
- throw new ServiceException("未查询到当前清表所关联的元素表信息");
|
|
|
- }
|
|
|
+ } else if (formElementDTO.getSubmitStatus() == 1) { // 修改实体信息
|
|
|
+ this.UpdateFormElement(formElementDTO);
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
|
|
|
- for (Long tableId : tableIds) {
|
|
|
- //获取当前wbs节点元素表信息
|
|
|
- WbsTree wbsTree = wbsTreeMapper.selectOne(Wrappers.<WbsTree>query().lambda().eq(WbsTree::getId, tableId));
|
|
|
- if (wbsTree != null) {
|
|
|
- if (StringUtils.isNotEmpty(wbsTree.getInitTableName())) {
|
|
|
- //查询实体表是否存在
|
|
|
- Integer obj = baseMapper.showShowTabLike(wbsTree);
|
|
|
- if (obj != 1) {
|
|
|
- //不存在对应实体表的元素表不新增同步元素字段
|
|
|
- continue;
|
|
|
- }
|
|
|
+ // 修改关联的实体信息表表字段
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
+ public void UpdateFormElement(FormElementDTO2 formElementDTO) { //修改元素字段信息
|
|
|
+ if (formElementDTO.getElementList().size() <= 0) {
|
|
|
+ throw new ServiceException("请添加至少一个元素信息");
|
|
|
+ }
|
|
|
+ //关联-在已有元素表中新增元素,在实体表中追加字段
|
|
|
+ //获取当前清表关联的所有tableIds
|
|
|
+ List<WbsTabRelationExcelTab> WbsTabRelationExcelTabs = baseMapper.selectWbsTabRelationExcelTab(null, String.valueOf(formElementDTO.getExcelTabId()));
|
|
|
+ List<Long> tableIds = WbsTabRelationExcelTabs.stream().map(WbsTabRelationExcelTab::getWbsTabId).collect(Collectors.toList());
|
|
|
+ if (tableIds.size() == 0) {
|
|
|
+ throw new ServiceException("未查询到当前清表所关联的元素表信息");
|
|
|
+ }
|
|
|
|
|
|
- //获取表单下的元素信息
|
|
|
- List<WbsFormElement> wbsFormElements = baseMapper.selectList(Wrappers.<WbsFormElement>query().lambda()
|
|
|
- .eq(WbsFormElement::getFId, tableId));
|
|
|
-
|
|
|
- WbsFormElement firstWbsFormElement;
|
|
|
- List<WbsFormElement> newList;
|
|
|
- //存在元素
|
|
|
- if (wbsFormElements.size() > 0) {
|
|
|
- Collections.reverse(wbsFormElements);
|
|
|
- firstWbsFormElement = wbsFormElements.stream().findFirst().orElse(wbsFormElements.get(wbsFormElements.size() - 1));
|
|
|
-
|
|
|
- //去重，元素表中名称已存在的元素不添加
|
|
|
- newList = formElementDTO.getElementList().stream().filter(a ->
|
|
|
- !wbsFormElements.stream().map(WbsFormElement::getEName).collect(Collectors.toList()).contains(a.getEName())
|
|
|
- ).collect(Collectors.toList());
|
|
|
-
|
|
|
- } else {
|
|
|
- //不存在元素
|
|
|
- firstWbsFormElement = new WbsFormElement();
|
|
|
- firstWbsFormElement.setEKey("key_0");
|
|
|
- newList = formElementDTO.getElementList();
|
|
|
- }
|
|
|
+ for (Long tableId : tableIds) {
|
|
|
+ //获取当前wbs节点元素表信息
|
|
|
+ WbsTree wbsTree = wbsTreeMapper.selectOne(Wrappers.<WbsTree>query().lambda().eq(WbsTree::getId, tableId));
|
|
|
+ if (wbsTree != null) {
|
|
|
+ if (StringUtils.isNotEmpty(wbsTree.getInitTableName())) {
|
|
|
+ //查询实体表是否存在
|
|
|
+ Integer obj = baseMapper.showShowTabLike(wbsTree);
|
|
|
+ if (obj != 1) {
|
|
|
+ //不存在对应实体表的元素表不新增同步元素字段
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
+ //获取表单下的元素信息
|
|
|
+ List<WbsFormElement> wbsFormElements = baseMapper.selectList(Wrappers.<WbsFormElement>query().lambda()
|
|
|
+ .eq(WbsFormElement::getFId, tableId));
|
|
|
+
|
|
|
+ WbsFormElement firstWbsFormElement;
|
|
|
+ List<WbsFormElement> newList;
|
|
|
+ //存在元素
|
|
|
+ if (wbsFormElements.size() > 0) {
|
|
|
+ Collections.reverse(wbsFormElements);
|
|
|
+ firstWbsFormElement = wbsFormElements.stream().findFirst().orElse(wbsFormElements.get(wbsFormElements.size() - 1));
|
|
|
+
|
|
|
+ //去重，元素表中名称已存在的元素不添加
|
|
|
+ newList = formElementDTO.getElementList().stream().filter(a ->
|
|
|
+ !wbsFormElements.stream().map(WbsFormElement::getEName).collect(Collectors.toList()).contains(a.getEName())
|
|
|
+ ).collect(Collectors.toList());
|
|
|
+
|
|
|
+ } else {
|
|
|
+ //不存在元素
|
|
|
+ firstWbsFormElement = new WbsFormElement();
|
|
|
+ firstWbsFormElement.setEKey("key_0");
|
|
|
+ newList = formElementDTO.getElementList();
|
|
|
+ }
|
|
|
|
|
|
- //初始化eKey字段
|
|
|
- int keyNumber = Integer.parseInt(firstWbsFormElement.getEKey().split("_")[1]);
|
|
|
- int newKeyNumber = keyNumber + 1;
|
|
|
- for (WbsFormElement wbsFormElementInfo : newList) {
|
|
|
- String key = "key_" + (newKeyNumber);
|
|
|
- //新增元素到当前表中
|
|
|
- wbsFormElementInfo.setEKey(key);
|
|
|
- wbsFormElementInfo.setId(SnowFlakeUtil.getId());
|
|
|
- wbsFormElementInfo.setFId(String.valueOf(tableId));
|
|
|
- wbsFormElementInfo.setStatus(1);
|
|
|
- wbsFormElementInfo.setELength(Integer.parseInt(WbsElementUtil.setDefaultElementLength(wbsFormElementInfo.getEType())));
|
|
|
-
|
|
|
- baseMapper.insert(wbsFormElementInfo);
|
|
|
-
|
|
|
- //String eTypeFiled = getInitTableFiledType(wbsFormElementInfo.getEType());
|
|
|
- //int eLengthFiled = Integer.parseInt(setDefaultElementLength(wbsFormElementInfo.getEType()));
|
|
|
-
|
|
|
- //判断是否存在该Key字段
|
|
|
- int row1 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
|
|
|
- if (row1 == 0) {
|
|
|
- //追加字段到实体表中
|
|
|
- wbsTreeMapper.alterTableFiled(wbsTree.getInitTableName(), key, "varchar", DEFAULT_ELEMENT_LENGTH_VARCHAR);
|
|
|
- //判断是否追加成功
|
|
|
- int row2 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
|
|
|
- if (row2 != 1) {
|
|
|
- //追加失败，删除元素，跳过
|
|
|
- baseMapper.deleteElementByfId2(wbsFormElementInfo.getId());
|
|
|
- continue;
|
|
|
- }
|
|
|
+ //初始化eKey字段
|
|
|
+ int keyNumber = Integer.parseInt(firstWbsFormElement.getEKey().split("_")[1]);
|
|
|
+ int newKeyNumber = keyNumber + 1;
|
|
|
+ for (WbsFormElement wbsFormElementInfo : newList) {
|
|
|
+ String key = "key_" + (newKeyNumber);
|
|
|
+ //新增元素到当前表中
|
|
|
+ wbsFormElementInfo.setEKey(key);
|
|
|
+ wbsFormElementInfo.setId(SnowFlakeUtil.getId());
|
|
|
+ wbsFormElementInfo.setFId(String.valueOf(tableId));
|
|
|
+ wbsFormElementInfo.setStatus(1);
|
|
|
+ wbsFormElementInfo.setELength(Integer.parseInt(WbsElementUtil.setDefaultElementLength(wbsFormElementInfo.getEType())));
|
|
|
+
|
|
|
+ baseMapper.insert(wbsFormElementInfo);
|
|
|
+
|
|
|
+ //String eTypeFiled = getInitTableFiledType(wbsFormElementInfo.getEType());
|
|
|
+ //int eLengthFiled = Integer.parseInt(setDefaultElementLength(wbsFormElementInfo.getEType()));
|
|
|
+
|
|
|
+ //判断是否存在该Key字段
|
|
|
+ int row1 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
|
|
|
+ if (row1 == 0) {
|
|
|
+ //追加字段到实体表中
|
|
|
+ wbsTreeMapper.alterTableFiled(wbsTree.getInitTableName(), key, "varchar", DEFAULT_ELEMENT_LENGTH_VARCHAR);
|
|
|
+ //判断是否追加成功
|
|
|
+ int row2 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
|
|
|
+ if (row2 != 1) {
|
|
|
+ //追加失败，删除元素，跳过
|
|
|
+ baseMapper.deleteElementByfId2(wbsFormElementInfo.getId());
|
|
|
+ continue;
|
|
|
}
|
|
|
- newKeyNumber++;
|
|
|
}
|
|
|
+ newKeyNumber++;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return true;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ // 修改实体表字段信息
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
+ public void UpdateFormElement(TableInfo tableInfo,FormElementDTO2 formElementDTO) { //修改元素字段信息
|
|
|
+ //获取当前wbs节点元素表信息
|
|
|
+ if (tableInfo != null) {
|
|
|
+ if (StringUtils.isNotEmpty(tableInfo.getTabEnName())) {
|
|
|
+ //查询实体表是否存在
|
|
|
+ WbsTree wbsTree = new WbsTree();
|
|
|
+ wbsTree.setInitTableName(tableInfo.getTabEnName());
|
|
|
+ Integer obj = baseMapper.showShowTabLike(wbsTree);
|
|
|
+ if (obj != 1) {
|
|
|
+ //不存在对应实体表的元素表不新增同步元素字段
|
|
|
+ throw new ServiceException("实体信息表不存在");
|
|
|
+ }
|
|
|
+
|
|
|
+ //获取表单下的元素信息
|
|
|
+ List<WbsFormElement> wbsFormElements = baseMapper.selectList(Wrappers.<WbsFormElement>query().lambda()
|
|
|
+ .eq(WbsFormElement::getFId, tableInfo.getId()));
|
|
|
+
|
|
|
+ WbsFormElement firstWbsFormElement;
|
|
|
+ List<WbsFormElement> newList;
|
|
|
+ //存在元素
|
|
|
+ if (wbsFormElements.size() > 0) {
|
|
|
+ Collections.reverse(wbsFormElements);
|
|
|
+ firstWbsFormElement = wbsFormElements.stream().findFirst().orElse(wbsFormElements.get(wbsFormElements.size() - 1));
|
|
|
+
|
|
|
+ //去重，元素表中名称已存在的元素不添加
|
|
|
+ newList = formElementDTO.getElementList().stream().filter(a ->
|
|
|
+ !wbsFormElements.stream().map(WbsFormElement::getEName).collect(Collectors.toList()).contains(a.getEName())
|
|
|
+ ).collect(Collectors.toList());
|
|
|
+
|
|
|
+ } else {
|
|
|
+ //不存在元素
|
|
|
+ firstWbsFormElement = new WbsFormElement();
|
|
|
+ firstWbsFormElement.setEKey("key_0");
|
|
|
+ newList = formElementDTO.getElementList();
|
|
|
+ }
|
|
|
+
|
|
|
+ //初始化eKey字段
|
|
|
+ int keyNumber = Integer.parseInt(firstWbsFormElement.getEKey().split("_")[1]);
|
|
|
+ int newKeyNumber = keyNumber + 1;
|
|
|
+ for (WbsFormElement wbsFormElementInfo : newList) {
|
|
|
+ String key = "key_" + (newKeyNumber);
|
|
|
+ //新增元素到当前表中
|
|
|
+ wbsFormElementInfo.setEKey(key);
|
|
|
+ wbsFormElementInfo.setId(SnowFlakeUtil.getId());
|
|
|
+ wbsFormElementInfo.setFId(tableInfo.getId()+"");
|
|
|
+ wbsFormElementInfo.setStatus(1);
|
|
|
+ wbsFormElementInfo.setELength(Integer.parseInt(WbsElementUtil.setDefaultElementLength(wbsFormElementInfo.getEType())));
|
|
|
+
|
|
|
+ baseMapper.insert(wbsFormElementInfo);
|
|
|
+
|
|
|
+ //String eTypeFiled = getInitTableFiledType(wbsFormElementInfo.getEType());
|
|
|
+ //int eLengthFiled = Integer.parseInt(setDefaultElementLength(wbsFormElementInfo.getEType()));
|
|
|
+
|
|
|
+ //判断是否存在该Key字段
|
|
|
+ int row1 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
|
|
|
+ if (row1 == 0) {
|
|
|
+ //追加字段到实体表中
|
|
|
+ wbsTreeMapper.alterTableFiled(wbsTree.getInitTableName(), key, "varchar", DEFAULT_ELEMENT_LENGTH_VARCHAR);
|
|
|
+ //判断是否追加成功
|
|
|
+ int row2 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
|
|
|
+ if (row2 != 1) {
|
|
|
+ //追加失败，删除元素，跳过
|
|
|
+ baseMapper.deleteElementByfId2(wbsFormElementInfo.getId());
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ newKeyNumber++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -561,10 +642,9 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
|
|
|
//获取新增节点ids
|
|
|
List<String> nodeIds = formElementDTO.getNodeIds();
|
|
|
// 无节点绑定wbs 树
|
|
|
- if(nodeIds==null && formElementDTO.getSubmitStatus()==3){
|
|
|
- nodeIds= new ArrayList<>();
|
|
|
+ if (nodeIds == null && formElementDTO.getSubmitStatus() == 3) {
|
|
|
+ nodeIds = new ArrayList<>();
|
|
|
nodeIds.add("-1234569");
|
|
|
- formElementDTO.setInitTableId(SnowFlakeUtil.getId());
|
|
|
}
|
|
|
|
|
|
if (nodeIds.size() <= 0) {
|
|
|
@@ -588,17 +668,41 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 实体信息表验证 如果实体表的名称 和数据表名称相同 则试用同一张表否则新建
|
|
|
//初始化
|
|
|
String newTableName = "m_" + DateUtil.time() + "_" + SnowFlakeUtil.getId();
|
|
|
- formElementDTO.setInitTableName(newTableName);
|
|
|
+ TableInfo tableInfo = tableInfoMapper.selectByTabEnName(formElementDTO.getNodeName());
|
|
|
+ boolean tabExit = true;
|
|
|
+ if(tableInfo==null){
|
|
|
+ tableInfo = new TableInfo();
|
|
|
+ tableInfo.setTabType(formElementDTO.getTableType());
|
|
|
+ tableInfo.setTableOwner(formElementDTO.getTableOwner());
|
|
|
+ tableInfo.setFillRate(formElementDTO.getFillRate());
|
|
|
+ tableInfo.setTabChName(formElementDTO.getNodeName());
|
|
|
+ tableInfo.setTabEnName(newTableName);
|
|
|
+ tableInfo.setIsDeleted(0);
|
|
|
+ tableInfoMapper.insert(tableInfo);
|
|
|
+ tabExit=false;
|
|
|
+ }else{
|
|
|
+ tableInfo.setTabType(formElementDTO.getTableType());
|
|
|
+ tableInfo.setTableOwner(formElementDTO.getTableOwner());
|
|
|
+ tableInfo.setFillRate(formElementDTO.getFillRate());
|
|
|
+ tableInfoMapper.updateById(tableInfo);
|
|
|
+ // 修改表结构
|
|
|
+ this.UpdateFormElement(tableInfo,formElementDTO);
|
|
|
+ }
|
|
|
+
|
|
|
+ formElementDTO.setInitTableName(tableInfo.getTabEnName());
|
|
|
+ formElementDTO.setInitTableId(tableInfo.getId());
|
|
|
//设置parentId=nodeId
|
|
|
formElementDTO.setParentId(Long.valueOf(nodeId));
|
|
|
-
|
|
|
//创建元素表
|
|
|
- boolean b = submit2(formElementDTO);
|
|
|
-
|
|
|
+ boolean b = false;
|
|
|
+ if(formElementDTO.getSubmitStatus()==2){
|
|
|
+ b = submit2(formElementDTO);
|
|
|
+ }
|
|
|
try {
|
|
|
- if (b) {
|
|
|
+ if (!tabExit) {
|
|
|
List<WbsFormElement> elementList = formElementDTO.getElementList();
|
|
|
int i = 1;
|
|
|
for (WbsFormElement wbsFormElement : elementList) {
|
|
|
@@ -614,14 +718,15 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
|
|
|
this.saveBatch(elementList);
|
|
|
|
|
|
//获取当前元素表中所有元素
|
|
|
- List<WbsFormElement> list = this.selectElementListByFid(String.valueOf(formElementDTO.getId()));
|
|
|
+ List<WbsFormElement> list = this.selectElementListByFid(String.valueOf(formElementDTO.getInitTableId()));
|
|
|
|
|
|
//初始化实体表
|
|
|
this.initTable(list, newTableName);
|
|
|
|
|
|
//绑定与清表关系
|
|
|
- baseMapper.insertWbsTabRelationExcelTab(SnowFlakeUtil.getId(), formElementDTO.getExcelTabId(), formElementDTO.getId());
|
|
|
-
|
|
|
+ if(formElementDTO.getSubmitStatus()==2){
|
|
|
+ baseMapper.insertWbsTabRelationExcelTab(SnowFlakeUtil.getId(), formElementDTO.getExcelTabId(), formElementDTO.getId());
|
|
|
+ }
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
//删除元素表
|
|
|
@@ -660,12 +765,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
|
|
|
if (StringUtils.isEmpty(dept.getFillRate())) {
|
|
|
dept.setFillRate("80%");
|
|
|
}
|
|
|
- if(dept.getSubmitStatus()==3){
|
|
|
- dept.setType(10);
|
|
|
- }else{
|
|
|
- dept.setType(2);
|
|
|
- }
|
|
|
-
|
|
|
+ dept.setType(2);
|
|
|
dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
|
|
|
dept.setNodeType(1);
|
|
|
dept.setStatus(1);
|
Administrator