From e390fc4a7d0a9ddce1e64d970207c398ef9d6c2c Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 30 Jul 2025 00:10:59 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/service/impl/ICoreServiceImpl.java | 60 ------------------- 1 file changed, 60 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java index eff1e66b..0861ae98 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java @@ -1466,7 +1466,6 @@ public class ICoreServiceImpl implements ICoreService { Map dataMap = dataValue.get(0); Map 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 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 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 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 queryDataByTableNameAndFiledAndValue(String ruleValueBdName, String ruleValueConFiled, Map map,OrgBookVO orgBookVO) { - Map 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 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> 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);