|
@@ -45,6 +45,7 @@ import org.springframework.scheduling.annotation.Scheduled;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import javax.validation.constraints.NotNull;
|
|
|
import java.io.File;
|
|
|
import java.io.FileInputStream;
|
|
|
import java.io.FileNotFoundException;
|
|
@@ -219,19 +220,25 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public IPage<TreeNodeVOByTabType> tabTypeLazyTreeAll(IPage<TreeNodeVOByTabType> page, Long parentId, String titleName) {
|
|
|
+ public IPage<TreeNodeVOByTabType> tabTypeLazyTreeAll(IPage<TreeNodeVOByTabType> page, Long parentId, String titleName, Boolean hasPartFormula) {
|
|
|
boolean base=false;
|
|
|
+ if(hasPartFormula==null){
|
|
|
+ hasPartFormula=true;
|
|
|
+ }
|
|
|
if ((parentId + "").equals("12345678910")) {
|
|
|
page.setSize(100);
|
|
|
base=true;
|
|
|
}
|
|
|
List<TreeNodeVOByTabType>data ;
|
|
|
- if("2222236".equals(parentId+"")){
|
|
|
+ if(SelectorModel.ID.equals(parentId)){
|
|
|
data =this.baseList();
|
|
|
}else{
|
|
|
data= baseMapper.tabTypeLazyTreeAll(page, parentId, titleName);
|
|
|
}
|
|
|
addBase(data,base);
|
|
|
+ if(base&&!hasPartFormula){
|
|
|
+ data.removeIf(e->e.getId()!=20&&!e.getId().equals(SelectorModel.ID));
|
|
|
+ }
|
|
|
return page.setRecords(data);
|
|
|
}
|
|
|
|
|
@@ -239,10 +246,10 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
|
|
|
public void addBase(List<TreeNodeVOByTabType> data,Boolean base){
|
|
|
if(base){
|
|
|
TreeNodeVOByTabType baseInfo = new TreeNodeVOByTabType();
|
|
|
- baseInfo.setTitle("基础信息");
|
|
|
- baseInfo.setPrimaryKeyId("BASIN");
|
|
|
- baseInfo.setParentId(12345678910L);
|
|
|
- baseInfo.setId(2222236L);
|
|
|
+ baseInfo.setTitle(SelectorModel.NODE_NAME);
|
|
|
+ /*baseInfo.setPrimaryKeyId("BASIN");*/
|
|
|
+ baseInfo.setParentId(SelectorModel.P_ID);
|
|
|
+ baseInfo.setId(SelectorModel.ID);
|
|
|
baseInfo.setHasChildren(true);
|
|
|
data.add(baseInfo);
|
|
|
}
|
|
@@ -254,8 +261,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
|
|
|
return titleMap.entrySet().stream().map(kv->{
|
|
|
TreeNodeVOByTabType tn = new TreeNodeVOByTabType();
|
|
|
tn.setTitle(kv.getKey());
|
|
|
- tn.setTabType("基础信息");
|
|
|
- tn.setParentId(2222236L);
|
|
|
+ tn.setTabType(SelectorModel.NODE_NAME);
|
|
|
+ tn.setParentId(SelectorModel.ID);
|
|
|
tn.setId(Long.parseLong(kv.getValue()[1]));
|
|
|
tn.setPrimaryKeyId(kv.getValue()[1]);
|
|
|
tn.setInitTableId(kv.getValue()[1]);
|
|
@@ -2415,6 +2422,14 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
+ public Boolean hasPart(String id){
|
|
|
+ if(Func.isNotBlank(id)) {
|
|
|
+ List<Map<String,Object>> mapList =this.jdbcTemplate.queryForList("select a.id from m_wbs_tree a join m_wbs_info b on a.wbs_id=b.id where a.id="+id+" and b.wbs_type=3 union select p_key_id from m_wbs_tree_private where p_key_id ="+id+" and wbs_type =3");
|
|
|
+ return mapList.size()==0;
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 修改initTableId
|
|
|
*/
|