From 926c2f0bda1f7bc2bfd8f42fff1310bc9103559b Mon Sep 17 00:00:00 2001 From: zhengyf Date: Tue, 17 Jun 2025 10:42:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E7=8E=B0=E9=87=91?= =?UTF-8?q?=E6=B5=81=E9=87=8F=E9=A1=B9=E7=9B=AE=E3=80=81=E7=A7=91=E7=9B=AE?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ae/comf/bd/controller/BdController.java | 33 +++++++++-- .../ae/comf/bd/dao/IMdmDBQueryVODAO.java | 4 ++ .../comf/bd/dao/impl/MdmDBQueryVODAOImpl.java | 18 ++++++ .../ae/comf/bd/entity/vo/CashFlowVO.java | 23 ++++++++ .../ae/comf/bd/entity/vo/GlSubrelationVO.java | 55 +++++++++++++++++++ .../ae/comf/bd/entity/vo/MdmDBQueryVO.xml | 54 ++++++++++++++++++ 6 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/CashFlowVO.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/GlSubrelationVO.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 48c43b06..d84fd3d8 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 @@ -6,9 +6,7 @@ import com.github.pagehelper.PageInfo; 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.*; -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.entity.vo.*; import com.hzya.frame.voucher.ae.comf.bd.utils.AccsubjTreeBuilder; import com.hzya.frame.web.action.DefaultController; import com.hzya.frame.web.entity.JsonResultEntity; @@ -45,7 +43,6 @@ public class BdController extends DefaultController { @Autowired private IMdmDbFiledVODAO mdmDbFiledVODAO; - /** * 查询所有公司 */ @@ -198,6 +195,34 @@ public class BdController extends DefaultController { return getFailureMessageEntity(e.getMessage()); } } + + /** + * 查询现金流映射表 + */ + @RequestMapping(value = "/queryCashFlowMap", method = RequestMethod.POST) + public JsonResultEntity queryCashFlowMap(@RequestBody CashFlowVO entity) { + try { + List cashFlowVOS = mdmDBQueryVODAO.queryCashflowVO(entity); + return getSuccessMessageEntity("请求成功", cashFlowVOS); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + /** + * 查询科目对应表 + */ + @RequestMapping(value = "/queryGlsubrelation", method = RequestMethod.POST) + public JsonResultEntity queryGlsubrelation(@RequestBody GlSubrelationVO entity) { + try { + List glSubrelationVOS = mdmDBQueryVODAO.queryGlsubrelationVO(entity); + return getSuccessMessageEntity("请求成功", glSubrelationVOS); + } 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 1657aae8..0fdd1d81 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,6 +1,8 @@ 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 java.util.List; @@ -11,4 +13,6 @@ import java.util.Map; */ public interface IMdmDBQueryVODAO extends IBaseDao { List> queryMdmDb(MdmDBQueryVO u8CQueryVO); + List queryCashflowVO(CashFlowVO cashFlowVO); + List queryGlsubrelationVO(GlSubrelationVO glSubrelationVO); } 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 37d07ea6..8a27fffd 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 @@ -1,7 +1,10 @@ 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 org.springframework.stereotype.Repository; @@ -18,4 +21,19 @@ public class MdmDBQueryVODAOImpl extends MybatisGenericDao List> maps = (List>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryMdmDb", u8CQueryVO); return maps; } + + + @Override + public List queryCashflowVO(CashFlowVO cashFlowVO) { + List cashFlowVOS =(List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryCashflowVO", cashFlowVO); + return cashFlowVOS; + } + + @Override + public List queryGlsubrelationVO(GlSubrelationVO glSubrelationVO) { + Assert.notNull(glSubrelationVO.getPkGlorgbook(),"查询科目对应表时，账簿主键不能为空"); + Assert.notNull(glSubrelationVO.getPkCashflow(),"查询科目对应表时，现金流项目主键不能为空"); + List glSubrelationVOS =(List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryGlsubrelationVO", glSubrelationVO); + return glSubrelationVOS; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/CashFlowVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/CashFlowVO.java new file mode 100644 index 00000000..879908cf --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/CashFlowVO.java @@ -0,0 +1,23 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity.vo; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +import java.util.Date; + +/** + * Created by zydd on 2025-06-16 14:32 + * 现金流映射表 + */ +@Data +public class CashFlowVO extends BaseEntity { + + private String pkCashflow;//现金流量项目主键 + private String pkCorp;// + private String cfitemcode;//现金流量项目编码 + private String cfitemname;//现金流量项目名称 + private String fathernode;//上级项目 + private String cftype;//现金流量项目类型 + private String itemflag;//是否主表项目 + +} 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 new file mode 100644 index 00000000..966a2034 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/GlSubrelationVO.java @@ -0,0 +1,55 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity.vo; + +import lombok.Data; + +import java.util.Date; + +/** + * Created by zydd on 2025-06-16 16:45 + * 现金流映射明细表-科目对应表 + */ +@Data +public class GlSubrelationVO { + /** 账簿主键 */ + private String pkGlorgbook; + /** 现金流量表项主键 */ + private String pk_cashflow; + + + /** 现金流主键 */ + private String pkCashflow; + /** 现金流编码 */ + private String cfitemcode; + /** 现金流名称 */ + private String cfitemname; + /** 科目对应表主键 */ + private String pkSubrelation; + + + /** 借方科目主键 */ + private String pkDebitsubject; + /** 借方科目编码 */ + private String jsubjcode; + /** 借方科目名称 */ + private String jsubjname; + /** 借方辅助核算 */ + private String dfreevalueid; + /** 借方默认 */ + private String isdd; + + + /** 贷方科目主键 */ + private String pkCreditsubject; + /** 贷方科目编码 */ + private String dsubjcode; + /** 贷方科目名称 */ + private String dsubjname; + /** 贷方辅助核算 */ + private String cfreevalueid; + /** 贷方默认*/ + private String iscd; + + private String dr; + private String memo; + private Date ts; +} 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 81fd455b..0f3bb79f 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 @@ -27,5 +27,59 @@ + + + +