hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、删除冗余代码

This commit is contained in:
zhengyf 2025-07-30 00:10:59 +08:00
parent 567082f52c
commit e390fc4a7d
1 changed files with 0 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java
View File

@ -1466,7 +1466,6 @@ public class ICoreServiceImpl implements ICoreService {
Map<String, Object> dataMap = dataValue.get(0);
Map<String, String> map = new LinkedHashMap<>();
try {
String fieldName = templateAssistEntity.getFieldName();
map = validFieldPathAss(templateAssistEntity, dataMap, orgBookVO);
} catch (Exception e) {
e.printStackTrace();
@ -1536,11 +1535,8 @@ public class ICoreServiceImpl implements ICoreService {
rule1Value_contFiled = field1Rule;
}
}
System.out.println(rule1Value_bdName);
System.out.println(rule1Value_contFiled);
//字段跟踪，表+字段+数据+公司
Map<String,Object> map1 = valueDispose(rule1Value_bdName,rule1Value_contFiled,dataValue,orgBookVO);
System.out.println(map1);
//根据bdName查询该档案的pk，code，name字段
MdmDbFiledVO mdmDbFiledVO1 = queryPkCodeNameByBdName(rule1Value_bdName.getRuleValue());
String tablepkname1 = mdmDbFiledVO1.getTablepkname();
@ -1576,11 +1572,8 @@ public class ICoreServiceImpl implements ICoreService {
rule1Value_contFiled = field1Rule;
}
}
System.out.println(rule1Value_bdName);
System.out.println(rule1Value_contFiled);
//字段跟踪，表+字段+数据+公司
Map<String,Object> map1 = valueDispose(rule1Value_bdName,rule1Value_contFiled,dataValue,orgBookVO);
System.out.println(map1);
//根据bdName查询该档案的pk，code，name字段
MdmDbFiledVO mdmDbFiledVO1 = queryPkCodeNameByBdName(rule1Value_bdName.getRuleValue());
String tablepkname1 = mdmDbFiledVO1.getTablepkname();
@ -1600,7 +1593,6 @@ public class ICoreServiceImpl implements ICoreService {
MdmModuleDbEntity mdmModuleDb2 = dbEntity2List.get(0);
//查询字段
MdmModuleDbFiledsEntity field2 = queryFileds(mdmModuleDb2.getId(), pathParts[2]);
System.out.println(field2);
String field2Id = field2.getId();
MdmModuleDbFiledsRuleEntity filedsRule2 = new MdmModuleDbFiledsRuleEntity();
filedsRule2.setFiledId(field2Id);
@ -1615,17 +1607,12 @@ public class ICoreServiceImpl implements ICoreService {
rule2Value_contFiled = field2Rule;
}
}
System.out.println(rule2Value_bdName);
System.out.println(rule2Value_contFiled);
Object o2 = map1.get(field2.getEnName());
if(o2==null){
Assert.state(false,"根据字段：{}，查询上层数据失败",map1);
}
String value2 = map1.get(field2.getEnName()).toString();
Map<String,Object> map2 = valueDispose(rule2Value_bdName,rule2Value_contFiled,value2,orgBookVO);
System.out.println(map2);
MdmDbFiledVO mdmDbFiledVO2 = queryPkCodeNameByBdName(rule2Value_bdName.getRuleValue());
String tablepkname2 = mdmDbFiledVO2.getTablepkname();
String codefieldname2 = mdmDbFiledVO2.getCodefieldname();
@ -1720,52 +1707,6 @@ public class ICoreServiceImpl implements ICoreService {
}
/**
*
* @param ruleValueBdName 来源表名
* @param ruleValueConFiled 来源字段
* @param map 关联数据
* @return
*/
private Map<String, Object> queryDataByTableNameAndFiledAndValue(String ruleValueBdName, String ruleValueConFiled, Map<String, String> map,OrgBookVO orgBookVO) {
Map<String, Object> data=new HashMap<>();
try {
System.out.println(map.get("code"));
String code = map.get("code");
//查值
MdmDBQueryVO mdmDBQueryVO = new MdmDBQueryVO();
mdmDBQueryVO.setTablename(ruleValueBdName);
mdmDBQueryVO.setProp7(ruleValueConFiled);
mdmDBQueryVO.setPropValue7(code);
mdmDBQueryVO.setPkentityorg(orgBookVO.getPkentityorg());
//查询表remark，是否包含管理
MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
mdmModuleDbEntity.setDbName(ruleValueBdName);
List<MdmModuleDbEntity> dbEntityList = mdmModuleDbDao.query(mdmModuleDbEntity);
if (dbEntityList.size() == 0) {
Assert.state(false, "根据表名:{},查询数据表失败", ruleValueBdName);
}
String remark = dbEntityList.get(0).getRemark();
if (remark != null && !"".equals(remark)) {
if (!remark.contains("管理")) {
mdmDBQueryVO.setPkentityorg(null);
}
}
List<Map<String, Object>> objectList = mdmDBQueryVODAO.queryMdmDb(mdmDBQueryVO);
System.out.println(objectList);
data=objectList.get(0);
}catch (Exception e){
e.printStackTrace();
Assert.state(false,"表名：{}，字段：{}，map：{}，关联数据转换失败，失败原因：{}。",ruleValueBdName,ruleValueConFiled,map,e.getMessage());
}
return data;
}
/**
*
* @param rule1ValueBdName 关联表名
@ -1779,7 +1720,6 @@ public class ICoreServiceImpl implements ICoreService {
try {
String bdName = rule1ValueBdName.getRuleValue();
String contFiled = rule1ValueContFiled.getRuleValue();
System.out.println(rule1ValueBdName);
MdmDBQueryVO mdmDBQueryVO = new MdmDBQueryVO();
mdmDBQueryVO.setTablename(bdName);
mdmDBQueryVO.setProp7(contFiled);