From dea87559c8870cfbf4e339f6091eb92cf05ce2f3 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 25 Jun 2025 10:39:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=9A=E8=AE=A1=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E6=A0=B8=E7=AE=97=E9=A1=B9=E7=9B=AE=E6=94=B9=E4=B8=BA=E4=B8=80?= =?UTF-8?q?=E5=BC=A0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ae/comf/bd/controller/BdController.java | 77 +++++++++++++ .../ae/comf/bd/dao/IMdmDBQueryVODAO.java | 6 +- .../comf/bd/dao/impl/MdmDBQueryVODAOImpl.java | 17 ++- .../ae/comf/bd/entity/vo/BdAccassitemVO.java | 20 ++++ .../ae/comf/bd/entity/vo/BdBdinfoEntity.java | 38 +++++++ .../comf/bd/entity/vo/BdSubjassBdInfoVO.java | 25 +++++ .../ae/comf/bd/entity/vo/GlSubrelationVO.java | 6 +- .../ae/comf/bd/entity/vo/MdmDBQueryVO.xml | 55 +++++++++ .../controller/MdmFileMappingController.java | 10 ++ .../ae/comf/module/service/IMdmService.java | 2 + .../module/service/impl/MdmServiceImpl.java | 106 +++++++++++++++++- 11 files changed, 351 insertions(+), 11 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdAccassitemVO.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdBdinfoEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdSubjassBdInfoVO.java diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java index d84fd3d8..3a3a69ed 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java @@ -3,6 +3,8 @@ package com.hzya.frame.voucher.ae.comf.bd.controller; import cn.hutool.core.lang.Assert; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModule.service.IMdmModuleService; import com.hzya.frame.voucher.ae.comf.bd.dao.*; import com.hzya.frame.voucher.ae.comf.bd.entity.*; @@ -39,6 +41,8 @@ public class BdController extends DefaultController { @Autowired private IMdmModuleService mdmModuleService; + @Autowired + private IMdmModuleDao mdmModuleDao; @Autowired private IMdmDbFiledVODAO mdmDbFiledVODAO; @@ -223,6 +227,79 @@ public class BdController extends DefaultController { return getFailureMessageEntity(e.getMessage()); } } + + /** + * 查询基础档案表bd_bdinfo + */ + @RequestMapping(value = "/queryBdInfo", method = RequestMethod.POST) + public JsonResultEntity queryBdInfo(@RequestBody BdBdinfoEntity entity) { + try { + List list = mdmDBQueryVODAO.queryBdBdinfoList(entity); + return getSuccessMessageEntity("请求成功", list); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + /** + * 查询辅助核算关联的档案 + */ + @RequestMapping(value = "/queryBdInfoBySubjass", method = RequestMethod.POST) + public JsonResultEntity queryBdInfoBySubjass(@RequestBody BdAccassitemVO entity) { + try { + List list = mdmDBQueryVODAO.queryBdInfoBySubjass(entity); + + return getSuccessMessageEntity("请求成功", list); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + /** + * 查询辅助核算关联的档案-事项分录可选 + */ + @RequestMapping(value = "/queryBdInfoBySubjassFilter", method = RequestMethod.POST) + public JsonResultEntity queryBdInfoBySubjassFilter(@RequestBody BdAccassitemVO entity) { + try { + List all = new ArrayList<>(); + //查询所有关联 + List list = mdmDBQueryVODAO.queryBdInfoBySubjass(entity); + //查询现有的档案 + List query = mdmModuleDao.queryMdm(null); + System.out.println(query); + for (BdAccassitemVO bdBdinfoEntity : list) { + for (MdmModuleEntity mdmModuleEntity : query) { + if (bdBdinfoEntity.getPkAccassitem().equals(mdmModuleEntity.getU8cDbPk()) + || bdBdinfoEntity.getPkAccassitem().equals(mdmModuleEntity.getNccDbPk()) + || bdBdinfoEntity.getPkAccassitem().equals(mdmModuleEntity.getYsDbPk())) { + all.add(bdBdinfoEntity); + break; + } + } + } + return getSuccessMessageEntity("请求成功", all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + +// /** +// * +// */ +// @RequestMapping(value = "/", method = RequestMethod.POST) +// public JsonResultEntity (@RequestBody entity) { +// try { +// List<> list = mdmDBQueryVODAO.(entity); +// return getSuccessMessageEntity("请求成功", list); +// } catch (Exception e) { +// e.printStackTrace(); +// return getFailureMessageEntity(e.getMessage()); +// } +// } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java index 0fdd1d81..73e2eff0 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java @@ -1,9 +1,7 @@ package com.hzya.frame.voucher.ae.comf.bd.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.CashFlowVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.GlSubrelationVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.*; import java.util.List; import java.util.Map; @@ -15,4 +13,6 @@ public interface IMdmDBQueryVODAO extends IBaseDao { List> queryMdmDb(MdmDBQueryVO u8CQueryVO); List queryCashflowVO(CashFlowVO cashFlowVO); List queryGlsubrelationVO(GlSubrelationVO glSubrelationVO); + List queryBdBdinfoList(BdBdinfoEntity entity); + List queryBdInfoBySubjass(BdAccassitemVO entity); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java index 8a27fffd..2f7ba9ea 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java @@ -3,9 +3,7 @@ package com.hzya.frame.voucher.ae.comf.bd.dao.impl; import cn.hutool.core.lang.Assert; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDBQueryVODAO; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.CashFlowVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.GlSubrelationVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.*; import org.springframework.stereotype.Repository; import java.util.List; @@ -36,4 +34,17 @@ public class MdmDBQueryVODAOImpl extends MybatisGenericDao List glSubrelationVOS =(List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryGlsubrelationVO", glSubrelationVO); return glSubrelationVOS; } + + @Override + public List queryBdBdinfoList(BdBdinfoEntity entity) { + List list =(List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryBdBdinfoList", entity); + + return list; + } + + @Override + public List queryBdInfoBySubjass(BdAccassitemVO entity) { + List list =(List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryBdInfoBySubjass", entity); + return list; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdAccassitemVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdAccassitemVO.java new file mode 100644 index 00000000..6d11ba5a --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdAccassitemVO.java @@ -0,0 +1,20 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity.vo; + +import lombok.Data; + +/** + * Created by zydd on 2025-06-25 10:20 + * 会计辅助核算项目 + */ +@Data +public class BdAccassitemVO { + private String pkAccassitem; + private String code; + private String name; + private String pkDefdef; + private String classid; + private String tablename; + private String tablepkname; + private String dr; + private String ts; +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdBdinfoEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdBdinfoEntity.java new file mode 100644 index 00000000..a67349e9 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdBdinfoEntity.java @@ -0,0 +1,38 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity.vo; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +/** + * Created by zydd on 2025-06-20 08:49 + * 基础数据：基础数据资源表 mdm_bd_bdinfo + */ +@Data +public class BdBdinfoEntity extends BaseEntity { + /** 基础数据主键 */ + private String pkDdinfo; + /** 基础数据编码 */ + private String bdcode; + /** 基础数据名称 */ + private String bdname; + /** 公司主键 */ + private String pkCorp; + /** 基本档案表名 */ + private String basedoctablename; + /** 基本表主键 */ + private String basedoctablepkname; + /** 是否自定义档案 */ + private String isdef; + /** 自定义档案主键 */ + private String pkDefdef; + /** 参照节点名 */ + private String refnodename; + /** 对应表名 */ + private String tablename; + /** 对应主键名 */ + private String tablepkname; + /** */ + private String dr; + /** */ + private String ts; +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdSubjassBdInfoVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdSubjassBdInfoVO.java new file mode 100644 index 00000000..c7b962a5 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdSubjassBdInfoVO.java @@ -0,0 +1,25 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity.vo; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +/** + * Created by zydd on 2025-06-20 09:45 + * 辅助核算关联的基础档案表 + */ +@Data +public class BdSubjassBdInfoVO extends BaseEntity { + private String pk_subjass; + private String pk_corp; + private String pk_glorgbook; + private String pk_bdinfo; + /** 基础数据编码 */ + private String bdcode; + /** 基础数据名称 */ + private String bdname; + private String pk_accsubj; + private String isnonleafused; + private String isempty; + private String dr; + private String ts; +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/GlSubrelationVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/GlSubrelationVO.java index 966a2034..124c220e 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/GlSubrelationVO.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/GlSubrelationVO.java @@ -31,9 +31,10 @@ public class GlSubrelationVO { /** 借方科目编码 */ private String jsubjcode; /** 借方科目名称 */ - private String jsubjname; + private String jdispname; /** 借方辅助核算 */ private String dfreevalueid; + private String dfreevaluename; /** 借方默认 */ private String isdd; @@ -43,9 +44,10 @@ public class GlSubrelationVO { /** 贷方科目编码 */ private String dsubjcode; /** 贷方科目名称 */ - private String dsubjname; + private String ddispname; /** 贷方辅助核算 */ private String cfreevalueid; + private String cfreevaluename; /** 贷方默认*/ private String iscd; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml index 0f3bb79f..61b29274 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml @@ -75,11 +75,66 @@ LEFT JOIN mdm_bd_accsubj accsubjd ON subrelation.pk_creditsubject=accsubjd.pk_accsubj WHERE 1=1 + and subrelation.dr != 1 AND subrelation.pk_cashflow = #{pkCashflow} AND subrelation.pk_glorgbook = #{pkGlorgbook} ORDER BY cashflow.cfitemcode ASC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.java index b2ea8c1c..81188fe3 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.java @@ -66,5 +66,15 @@ public class MdmFileMappingController extends DefaultController { } } + @RequestMapping(value = "/queryMdmAndFiledssByMdmId", method = RequestMethod.POST) + public JsonResultEntity queryMdmAndFiledssByMdmId(@RequestBody MdmModuleDbEntity entity) { + try { + MdmModuleDbEntity all = mdmService.queryMdmAndFiledssByMdmId(entity); + return getSuccessMessageEntity("请求成功", all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/IMdmService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/IMdmService.java index bdb00f16..6085a978 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/IMdmService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/IMdmService.java @@ -10,4 +10,6 @@ import java.util.List; */ public interface IMdmService { List queryMdmAndFiledsByMdmId(MdmModuleDbEntity entity); + + MdmModuleDbEntity queryMdmAndFiledssByMdmId(MdmModuleDbEntity entity); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/impl/MdmServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/impl/MdmServiceImpl.java index 6fb0a09b..e0c29bf9 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/impl/MdmServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/impl/MdmServiceImpl.java @@ -1,17 +1,22 @@ package com.hzya.frame.voucher.ae.comf.module.service.impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.mdm.mdmModule.service.IMdmModuleService; import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; import com.hzya.frame.mdm.mdmModuleDbFileds.dao.IMdmModuleDbFiledsDao; import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; import com.hzya.frame.mdm.mdmModuleDbFiledsRule.dao.IMdmModuleDbFiledsRuleDao; +import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; import com.hzya.frame.voucher.ae.comf.module.service.IMdmService; +import com.hzya.frame.web.entity.JsonResultEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * Created by zydd on 2025-05-27 15:06 @@ -19,24 +24,28 @@ import java.util.List; @Service public class MdmServiceImpl implements IMdmService { + private int i = 0; + @Autowired private IMdmModuleDbDao mdmModuleDbDao; @Autowired private IMdmModuleDbFiledsDao mdmModuleDbFiledsDao; @Autowired private IMdmModuleDbFiledsRuleDao mdmModuleDbFiledsRuleDao; + @Autowired + private IMdmModuleService mdmModuleService; //根据单据id查询表以及相关字段 @Override public List queryMdmAndFiledsByMdmId(MdmModuleDbEntity entity) { - Assert.notNull(entity.getMdmId(),"根据"); - List res=new ArrayList<>(); + Assert.notNull(entity.getMdmId(), "mdmId不能为空"); + List res = new ArrayList<>(); //查询单据 List mdmModuleDbEntityList = mdmModuleDbDao.query(entity); //查询字段,1、主表 2、明细 3、操作日志 4、下发日志 for (MdmModuleDbEntity mdmModuleDbEntity : mdmModuleDbEntityList) { - if("3".equals(mdmModuleDbEntity.getDbType())||"4".equals(mdmModuleDbEntity.getDbType())){ + if ("3".equals(mdmModuleDbEntity.getDbType()) || "4".equals(mdmModuleDbEntity.getDbType())) { continue; } MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); @@ -48,4 +57,95 @@ public class MdmServiceImpl implements IMdmService { return res; } + + /** + * 查询字段rules，查询是否关联别的表 + * + * @param entity + * @return + */ + @Override + public MdmModuleDbEntity queryMdmAndFiledssByMdmId(MdmModuleDbEntity entity) { + i = 0; + List mdmModuleDbEntityList = queryMdmAndFiledsByMdmId(entity); + if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { + return null; + } + MdmModuleDbEntity mdmModuleDbEntity = mdmModuleDbEntityList.get(0); + List sublistMdmModuleDbFileds = mdmModuleDbEntity.getSublistMdmModuleDbFileds(); + //查询每个字段的rule + List dbEntities = new ArrayList<>(); + if (sublistMdmModuleDbFileds != null && sublistMdmModuleDbFileds.size() > 0) { + for (int i = 0; i < sublistMdmModuleDbFileds.size(); i++) { + if ("1".equals(sublistMdmModuleDbFileds.get(i).getViewType())) { + dbEntities.add(sublistMdmModuleDbFileds.get(i)); + MdmModuleDbFiledsRuleEntity ruleEntity = new MdmModuleDbFiledsRuleEntity(); + ruleEntity.setMdmId(sublistMdmModuleDbFileds.get(i).getMdmId()); + ruleEntity.setFiledId(sublistMdmModuleDbFileds.get(i).getId()); + List mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(ruleEntity); + sublistMdmModuleDbFileds.get(i).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRuleEntities); + } + } + } + mdmModuleDbEntity.setSublistMdmModuleDbFileds(dbEntities); + + //根据rule再查询关联的数据 + for (MdmModuleDbFiledsEntity dbEntity : dbEntities) { + for (MdmModuleDbFiledsRuleEntity filedRule : dbEntity.getMdmModuleDbFiledsRules()) { + if ("typeOptionRuleForm".equals(filedRule.getFormName()) && "service".equals(filedRule.getRuleCode())) { + System.out.println(filedRule.getRuleValue()); + //根据db_name查询字段 + queryFiledsByDbname(dbEntity, filedRule); + } + + } + } + return mdmModuleDbEntity; + } + + /** + * 根据db_name查询字段，注意循环嵌套 + * 根据rule form_name='typeOptionRuleForm' rule_code='service' + */ + public void queryFiledsByDbname(MdmModuleDbFiledsEntity dbfiledEntity, MdmModuleDbFiledsRuleEntity filedRule) { + if (i >= 3) { + Assert.state(false, "字段：{}，关联层数超过3层，请查询是否存在死循环嵌套", dbfiledEntity.getChName()); + } + i++; + //查询表，再查询字段 + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setDbName(filedRule.getRuleValue()); + List mdmModuleDbEntityList = mdmModuleDbDao.query(mdmModuleDbEntity); + if (mdmModuleDbEntityList.size() == 0) { + Assert.state(false, "查询表：{}。失败", filedRule.getRuleValue()); + } + dbfiledEntity.setMdmModuleDbEntity(mdmModuleDbEntityList.get(0)); + + //查询字段 + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setDbId(mdmModuleDbEntityList.get(0).getId()); + List filedList = mdmModuleDbFiledsDao.query(mdmModuleDbFiledsEntity); + + //过滤viewType1 + List filedType1 = filedList.stream().filter(dbField -> "1".equals(dbField.getViewType())).collect(Collectors.toList()); + mdmModuleDbEntityList.get(0).setSublistMdmModuleDbFileds(filedType1); + + //查询rule + for (MdmModuleDbFiledsEntity dbFiledsEntity : filedType1) { + MdmModuleDbFiledsRuleEntity ruleEntity = new MdmModuleDbFiledsRuleEntity(); + ruleEntity.setMdmId(dbFiledsEntity.getMdmId()); + ruleEntity.setFiledId(dbFiledsEntity.getId()); + List mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(ruleEntity); + dbFiledsEntity.setMdmModuleDbFiledsRules(mdmModuleDbFiledsRuleEntities); + } + + //在再判断filedType1中的rule是否有form_name='typeOptionRuleForm' rule_code='service'，有则嵌套，没有则返回 + for (MdmModuleDbFiledsEntity dbFiledEntity : filedType1) { + for (MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRule : dbFiledEntity.getMdmModuleDbFiledsRules()) { + if ("typeOptionRuleForm".equals(mdmModuleDbFiledsRule.getFormName()) && "service".equals(mdmModuleDbFiledsRule.getRuleCode())) { + queryFiledsByDbname(dbFiledEntity, mdmModuleDbFiledsRule); + } + } + } + } }