From 29b9d70eb5f939e6073edf8138531b198f57ce02 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Thu, 12 Jun 2025 14:39:53 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=EF=BC=8C=E7=A7=91=E7=9B=AE=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=B1=BB=E4=B8=BB=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E4=BC=98=E5=8C=96=E7=AD=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ae/comf/bd/controller/BdController.java | 87 +++++++++++-------- .../ae/comf/bd/dao/IAeConfBdOrgBookVODao.java | 3 +- .../ae/comf/bd/dao/IMdmDBQueryVODAO.java | 14 +++ .../ae/comf/bd/dao/IMdmDbFiledVODAO.java | 14 +++ .../ae/comf/bd/dao/IU8CQueryVODAO.java | 15 ---- .../bd/dao/impl/AeConfBdOrgBookVODaoImpl.java | 2 +- .../comf/bd/dao/impl/MdmDBQueryVODAOImpl.java | 21 +++++ .../comf/bd/dao/impl/MdmDbFiledVODAOImpl.java | 21 +++++ .../comf/bd/dao/impl/U8CQueryVODAOImpl.java | 27 ------ .../comf/bd/entity/AeConfBdAccsubjEntity.xml | 10 +-- .../voucher/ae/comf/bd/entity/U8CQueryVO.xml | 30 ------- .../{U8CQueryVO.java => vo/MdmDBQueryVO.java} | 4 +- .../ae/comf/bd/entity/vo/MdmDBQueryVO.xml | 31 +++++++ .../ae/comf/bd/entity/vo/MdmDbFiledVO.java | 34 ++++++++ .../ae/comf/bd/entity/vo/MdmDbFiledVO.xml | 57 ++++++++++++ .../ae/comf/bd/entity/{ => vo}/OrgBookVO.java | 2 +- .../ae/comf/bd/entity/{ => vo}/OrgBookVO.xml | 10 +-- 17 files changed, 259 insertions(+), 123 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDbFiledVODAO.java delete mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IU8CQueryVODAO.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDbFiledVODAOImpl.java delete mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/U8CQueryVODAOImpl.java delete mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/U8CQueryVO.xml rename base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/{U8CQueryVO.java => vo/MdmDBQueryVO.java} (87%) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.xml rename base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/{ => vo}/OrgBookVO.java (93%) rename base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/{ => vo}/OrgBookVO.xml (92%) 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 d85dcd72..2c1acd99 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,17 +3,14 @@ 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.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModule.service.IMdmModuleService; -import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdAccsubjDao; -import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdBdinfoDao; -import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdOrgBookVODao; -import com.hzya.frame.voucher.ae.comf.bd.dao.IU8CQueryVODAO; +import com.hzya.frame.voucher.ae.comf.bd.dao.*; import com.hzya.frame.voucher.ae.comf.bd.entity.*; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDbFiledVO; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO; import com.hzya.frame.voucher.ae.comf.bd.utils.AccsubjTreeBuilder; -import com.hzya.frame.voucher.constant.ProfilesActiveConstant; import com.hzya.frame.web.action.DefaultController; -import com.hzya.frame.web.entity.BaseEntity; import com.hzya.frame.web.entity.JsonResultEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -40,11 +37,14 @@ public class BdController extends DefaultController { @Autowired private IAeConfBdAccsubjDao aeConfBdAccsubjDao; @Autowired - private IU8CQueryVODAO u8CQueryVODAO; + private IMdmDBQueryVODAO mdmDBQueryVODAO; @Autowired private IMdmModuleService mdmModuleService; + @Autowired + private IMdmDbFiledVODAO mdmDbFiledVODAO; + /** * 查询所有公司账簿信息 */ @@ -72,24 +72,27 @@ public class BdController extends DefaultController { // return getFailureMessageEntity("请求失败", e.getMessage()); // } // } + /** * 查询基础数据资源表 */ @RequestMapping(value = "/queryBdinfoList", method = RequestMethod.POST) - public JsonResultEntity queryMdmfileList(@RequestBody MdmModuleEntity entity) { + public JsonResultEntity queryBdinfoList(@RequestBody MdmDbFiledVO entity) { try { - MdmModuleEntity mdmModuleEntity1 = new MdmModuleEntity(); - mdmModuleEntity1.setMdmType("1");//1、档案 2、单据 - List all = new ArrayList<>(); - List mdmModuleEntityList = mdmModuleService.query(mdmModuleEntity1); - if(entity.getMdmName()!=null) { - for (MdmModuleEntity mdmModuleEntity : mdmModuleEntityList) { - if (mdmModuleEntity.getMdmName().contains(entity.getMdmName())) { - all.add(mdmModuleEntity); + MdmDbFiledVO mdmDbFiledVO = new MdmDbFiledVO(); + mdmDbFiledVO.setMdmType("1");//1、档案 2、单据 + List all = new ArrayList<>(); + List mdmDbFiledVOList = mdmDbFiledVODAO.queryMdmDbFiledVO(mdmDbFiledVO); + + + if (entity.getMdmName() != null) { + for (MdmDbFiledVO mdmDbFiled : mdmDbFiledVOList) { + if (mdmDbFiled.getMdmName().contains(entity.getMdmName())) { + all.add(mdmDbFiled); } } - }else { - all = mdmModuleEntityList; + } else { + all = mdmDbFiledVOList; } return getSuccessMessageEntity("请求成功", all); } catch (Exception e) { @@ -114,20 +117,38 @@ public class BdController extends DefaultController { } } +// /** +// * 查询基础数据数据表，直连U8C数据库 +// */ +// @RequestMapping(value = "/queryDataByMap", method = RequestMethod.POST) +// public JsonResultEntity queryDataByMap(@RequestBody HashMap map) { +// try { +// if (map.get("tablename") == null || "".equals(map.get("tablename"))) { +// return getSuccessMessageEntity("请求成功", null); +// } +// //查询u8c数据库 +// U8CQueryVO u8CQueryVO = new U8CQueryVO(); +// u8CQueryVO.setDataSourceCode(ProfilesActiveConstant.LETS_PROD_DATE_SOURCE); +// u8CQueryVO.setTablename(map.get("tablename")); +// List> objectList = u8CQueryVODAO.queryU8CBD(u8CQueryVO); +// +// return getSuccessMessageEntity("请求成功", objectList); +// } catch (Exception e) { +// e.printStackTrace(); +// return getFailureMessageEntity("请求失败", e.getMessage()); +// } +// } + /** - * 查询基础数据数据表 + * 查询基础数据数据表，查询本地库 */ @RequestMapping(value = "/queryDataByMap", method = RequestMethod.POST) - public JsonResultEntity queryDataByMap(@RequestBody HashMap map) { + public JsonResultEntity queryDataByMap(@RequestBody MdmDBQueryVO mdmDBQueryVO) { try { - if (map.get("tablename") == null || "".equals(map.get("tablename"))) { + if (mdmDBQueryVO.getTablename() == null || "".equals(mdmDBQueryVO.getTablename())) { return getSuccessMessageEntity("请求成功", null); } - //查询u8c数据库 - U8CQueryVO u8CQueryVO = new U8CQueryVO(); - u8CQueryVO.setDataSourceCode(ProfilesActiveConstant.LETS_PROD_DATE_SOURCE); - u8CQueryVO.setTablename(map.get("tablename")); - List> objectList = u8CQueryVODAO.queryU8CBD(u8CQueryVO); + List> objectList = mdmDBQueryVODAO.queryMdmDb(mdmDBQueryVO); return getSuccessMessageEntity("请求成功", objectList); } catch (Exception e) { @@ -140,17 +161,13 @@ public class BdController extends DefaultController { * 查询基础数据数据表 */ @RequestMapping(value = "/queryDataPagedByMap", method = RequestMethod.POST) - public JsonResultEntity queryDataPagedByMap(@RequestBody U8CQueryVO entity) { + public JsonResultEntity queryDataPagedByMap(@RequestBody MdmDBQueryVO mdmDBQueryVO) { try { - if (entity.getTablename() == null || "".equals(entity.getTablename())) { + if (mdmDBQueryVO.getTablename() == null || "".equals(mdmDBQueryVO.getTablename())) { return getSuccessMessageEntity("请求成功", null); } - PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); - //查询u8c数据库 - U8CQueryVO u8CQueryVO = new U8CQueryVO(); - u8CQueryVO.setDataSourceCode(ProfilesActiveConstant.LETS_PROD_DATE_SOURCE); - u8CQueryVO.setTablename(entity.getTablename()); - List> objectList = u8CQueryVODAO.queryU8CBD(u8CQueryVO); + PageHelper.startPage(mdmDBQueryVO.getPageNum(), mdmDBQueryVO.getPageSize()); + List> objectList = mdmDBQueryVODAO.queryMdmDb(mdmDBQueryVO); PageInfo pageInfo = new PageInfo(objectList); return getSuccessMessageEntity("请求成功", pageInfo); diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java index f988e60b..8def8bc9 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java @@ -1,8 +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.OrgBookVO; -import com.hzya.frame.voucher.ae.comf.module.entity.AeConfBusinessModuleEntity; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO; import java.util.List; 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 new file mode 100644 index 00000000..1657aae8 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java @@ -0,0 +1,14 @@ +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.MdmDBQueryVO; + +import java.util.List; +import java.util.Map; + +/** + * Created by zydd on 2025-06-06 10:03 + */ +public interface IMdmDBQueryVODAO extends IBaseDao { + List> queryMdmDb(MdmDBQueryVO u8CQueryVO); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDbFiledVODAO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDbFiledVODAO.java new file mode 100644 index 00000000..c182942d --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDbFiledVODAO.java @@ -0,0 +1,14 @@ +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.MdmDbFiledVO; + +import java.util.List; +import java.util.Map; + +/** + * Created by zydd on 2025-06-06 10:03 + */ +public interface IMdmDbFiledVODAO extends IBaseDao { + public List queryMdmDbFiledVO(MdmDbFiledVO vo); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IU8CQueryVODAO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IU8CQueryVODAO.java deleted file mode 100644 index f269d458..00000000 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IU8CQueryVODAO.java +++ /dev/null @@ -1,15 +0,0 @@ -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.OrgBookVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.U8CQueryVO; - -import java.util.List; -import java.util.Map; - -/** - * Created by zydd on 2025-06-06 10:03 - */ -public interface IU8CQueryVODAO extends IBaseDao { - List> queryU8CBD(U8CQueryVO u8CQueryVO); -} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java index 560e7141..26d98ef4 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java @@ -2,7 +2,7 @@ package com.hzya.frame.voucher.ae.comf.bd.dao.impl; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdOrgBookVODao; -import com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO; import org.springframework.stereotype.Repository; import java.util.List; 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 new file mode 100644 index 00000000..37d07ea6 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java @@ -0,0 +1,21 @@ +package com.hzya.frame.voucher.ae.comf.bd.dao.impl; + +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.MdmDBQueryVO; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * Created by zydd on 2025-06-06 10:05 + */ +@Repository +public class MdmDBQueryVODAOImpl extends MybatisGenericDao implements IMdmDBQueryVODAO { + @Override + public List> queryMdmDb(MdmDBQueryVO u8CQueryVO) { + List> maps = (List>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryMdmDb", u8CQueryVO); + return maps; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDbFiledVODAOImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDbFiledVODAOImpl.java new file mode 100644 index 00000000..92ed42f6 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDbFiledVODAOImpl.java @@ -0,0 +1,21 @@ +package com.hzya.frame.voucher.ae.comf.bd.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDbFiledVODAO; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDbFiledVO; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by zydd on 2025-06-12 10:26 + */ +@Service +public class MdmDbFiledVODAOImpl extends MybatisGenericDao implements IMdmDbFiledVODAO { + @Override + public List queryMdmDbFiledVO(MdmDbFiledVO vo) { + List mdmDbFiledVOList = (List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDbFiledVODAOImpl.queryMdmDbFiledVO", vo); + return mdmDbFiledVOList; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/U8CQueryVODAOImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/U8CQueryVODAOImpl.java deleted file mode 100644 index da4c26ac..00000000 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/U8CQueryVODAOImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzya.frame.voucher.ae.comf.bd.dao.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdOrgBookVODao; -import com.hzya.frame.voucher.ae.comf.bd.dao.IU8CQueryVODAO; -import com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.U8CQueryVO; -import com.hzya.frame.voucher.constant.ProfilesActiveConstant; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Map; - -/** - * Created by zydd on 2025-06-06 10:05 - */ -@Repository -public class U8CQueryVODAOImpl extends MybatisGenericDao implements IU8CQueryVODAO { - @Override - @DS(ProfilesActiveConstant.LETS_PROD_DATE_SOURCE) - public List> queryU8CBD(U8CQueryVO u8CQueryVO) { - - List> maps = (List>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.U8CQueryVODAOImpl.queryU8CBD", u8CQueryVO); - return maps; - } -} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.xml index aa889177..2abb57f4 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.xml @@ -35,7 +35,7 @@ parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity"> select - from ae_conf_bd_accsubj + from mdm_bd_accsubj and dispname = #{dispname} and dr = #{dr} @@ -50,13 +50,13 @@ and subjname = #{subjname} and ts = #{ts} - ORDER BY ae_conf_bd_accsubj.subjcode ASC + ORDER BY mdm_bd_accsubj.subjcode ASC - select - * - from - ${tablename} - - and #{prop1}=#{propValue1} - and #{prop2}=#{propValue2} - and #{prop3}=#{propValue3} - and #{prop4}=#{propValue4} - and #{prop5}=#{propValue5} - and #{prop6}=#{propValue6} - and #{prop7}=#{propValue7} - and #{prop8}=#{propValue8} - and #{prop9}=#{propValue9} - and #{prop10}=#{propValue10} - - - - - diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/U8CQueryVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java similarity index 87% rename from base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/U8CQueryVO.java rename to base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java index bd57606c..583fca97 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/U8CQueryVO.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java @@ -1,4 +1,4 @@ -package com.hzya.frame.voucher.ae.comf.bd.entity; +package com.hzya.frame.voucher.ae.comf.bd.entity.vo; import com.hzya.frame.web.entity.BaseEntity; import lombok.Data; @@ -7,7 +7,7 @@ import lombok.Data; * Created by zydd on 2025-06-06 09:59 */ @Data -public class U8CQueryVO extends BaseEntity { +public class MdmDBQueryVO extends BaseEntity { private String tablename; private String prop1; private String prop2; 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 new file mode 100644 index 00000000..81fd455b --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.java new file mode 100644 index 00000000..9bf15efe --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.java @@ -0,0 +1,34 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity.vo; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +/** + * 主数据模版(MdmModule)实体类 + * + * @author makejava + * @since 2024-06-03 08:46:29 + */ +@Data +public class MdmDbFiledVO extends BaseEntity { + private String mdmType; + /** 档案id */ + private String mdmId; + /** 档案编码 */ + private String mdmCode; + /** 档案名称 */ + private String mdmName; + /** 表id */ + private String dbId; + /** 对应表名 */ + private String tablename; + /** 表中文名称 */ + private String dbName; + /** 对应主键名 */ + private String tablepkname; + /** 名称字段 */ + private String namefieldname; + /** 编码字段名称 */ + private String codefieldname; +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.xml new file mode 100644 index 00000000..042478f7 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + mdmId, + mdmCode, + mdmName, + dbId, + tablename, + dbName, + tablepkname, + namefieldname, + codefieldname, + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.java similarity index 93% rename from base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.java rename to base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.java index 2266f43c..d2513aec 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.java @@ -1,4 +1,4 @@ -package com.hzya.frame.voucher.ae.comf.bd.entity; +package com.hzya.frame.voucher.ae.comf.bd.entity.vo; import com.hzya.frame.web.entity.BaseEntity; import lombok.Data; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.xml similarity index 92% rename from base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.xml rename to base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.xml index aa60d192..da39da3c 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.xml @@ -2,7 +2,7 @@ - + @@ -29,15 +29,15 @@