From 43b44223b3de7048f2ff8c1c882bf773d3da7ff4 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 11 Jun 2025 18:03:04 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E7=A7=91=E7=9B=AE?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=85=AC=E5=8F=B8=EF=BC=8C=E8=B4=A6=E7=B0=BF?= =?UTF-8?q?=EF=BC=8C=E8=B4=A6=E7=B0=BF=E7=B1=BB=E5=9E=8B=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=BA=E4=B8=AD=E5=8F=B0=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E8=A1=A8=E4=B8=BA=E4=B8=AD=E5=8F=B0=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ae/comf/bd/controller/BdController.java | 37 +- .../comf/bd/entity/AeConfBdAccsubjEntity.java | 78 --- .../comf/bd/entity/AeConfBdAccsubjEntity.xml | 625 ++---------------- .../voucher/ae/comf/bd/entity/OrgBookVO.xml | 28 +- .../controller/MdmFileMappingController.java | 70 ++ .../mdm/mdmModule/entity/MdmModuleEntity.java | 9 + .../mdm/mdmModule/entity/MdmModuleEntity.xml | 8 + .../service/impl/MdmModuleServiceImpl.java | 3 +- .../impl/MdmModuleDbFiledsServiceImpl.java | 3 +- .../entity/MdmModuleDbFiledsRuleEntity.xml | 7 +- 10 files changed, 219 insertions(+), 649 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.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 93a92b2f..d85dcd72 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.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; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -39,6 +42,9 @@ public class BdController extends DefaultController { @Autowired private IU8CQueryVODAO u8CQueryVODAO; + @Autowired + private IMdmModuleService mdmModuleService; + /** * 查询所有公司账簿信息 */ @@ -53,13 +59,38 @@ public class BdController extends DefaultController { } } +// /** +// * 查询基础数据资源表 +// */ +// @RequestMapping(value = "/queryBdinfoList", method = RequestMethod.POST) +// public JsonResultEntity queryBdinfoList(@RequestBody AeConfBdBdinfoEntity entity) { +// try { +// List all = aeConfBdBdinfoDao.queryByLike(entity); +// return getSuccessMessageEntity("请求成功", all); +// } catch (Exception e) { +// e.printStackTrace(); +// return getFailureMessageEntity("请求失败", e.getMessage()); +// } +// } /** * 查询基础数据资源表 */ @RequestMapping(value = "/queryBdinfoList", method = RequestMethod.POST) - public JsonResultEntity queryBdinfoList(@RequestBody AeConfBdBdinfoEntity entity) { + public JsonResultEntity queryMdmfileList(@RequestBody MdmModuleEntity entity) { try { - List all = aeConfBdBdinfoDao.queryByLike(entity); + 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); + } + } + }else { + all = mdmModuleEntityList; + } return getSuccessMessageEntity("请求成功", all); } catch (Exception e) { e.printStackTrace(); @@ -129,3 +160,5 @@ public class BdController extends DefaultController { } } } + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.java index 872e946d..ee6e238f 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.java @@ -14,95 +14,17 @@ import lombok.Data; */ @Data public class AeConfBdAccsubjEntity extends BaseEntity { - private String accremove; - private String balanflag; - private Long balanorient; - private String beginperiod; - private String beginyear; - private String bothorient; - private Long cashbankflag; - private Long checkdouble; - private Long checktype; - private String createcorp; - private String createperiod; - private String createyear; - private String ctlsystem; - private String currency; private String dispname; private Long dr; private String endflag; - private String endperiod; - private String endyear; - private String engsubjname; - @JsonIgnore - private String free1; - @JsonIgnore - private String free10; - @JsonIgnore - private String free11; - @JsonIgnore - private String free12; - @JsonIgnore - private String free13; - @JsonIgnore - private String free14; - @JsonIgnore - private String free15; - @JsonIgnore - private String free16; - @JsonIgnore - private String free17; - @JsonIgnore - private String free18; - @JsonIgnore - private String free19; - @JsonIgnore - private String free2; - @JsonIgnore - private String free20; - @JsonIgnore - private String free3; - @JsonIgnore - private String free4; - @JsonIgnore - private String free5; - @JsonIgnore - private String free6; - @JsonIgnore - private String free7; - @JsonIgnore - private String free8; - @JsonIgnore - private String free9; - private String incurflag; - private String innerinfonull; - private String innersubj; - private String outflag; private String pkAccsubj; private String pkCorp; - private String pkCreateGlorgbook; private String pkGlorgbook; - private String pkGrpaccsubj; - private String pkSubjscheme; - private String pkSubjtype; - @JsonIgnore - private String property1; - @JsonIgnore - private String property2; - @JsonIgnore - private String property3; - @JsonIgnore - private String property4; - @JsonIgnore - private String property5; - private String remcode; private String sealflag; private String stoped; private String subjcode; private Long subjlev; private String subjname; - private Long sumprintLevel; private Date ts; - private String unit; } 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 8ca1a386..aa889177 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 @@ -2,141 +2,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - ACCREMOVE - ,BALANFLAG - ,BALANORIENT - ,BEGINPERIOD - ,BEGINYEAR - ,BOTHORIENT - ,CASHBANKFLAG - ,CHECKDOUBLE - ,CHECKTYPE - ,CREATECORP - ,CREATEPERIOD - ,CREATEYEAR - ,CTLSYSTEM - ,CURRENCY - ,DISPNAME - ,DR - ,ENDFLAG - ,ENDPERIOD - ,ENDYEAR - ,ENGSUBJNAME - ,FREE1 - ,FREE10 - ,FREE11 - ,FREE12 - ,FREE13 - ,FREE14 - ,FREE15 - ,FREE16 - ,FREE17 - ,FREE18 - ,FREE19 - ,FREE2 - ,FREE20 - ,FREE3 - ,FREE4 - ,FREE5 - ,FREE6 - ,FREE7 - ,FREE8 - ,FREE9 - ,INCURFLAG - ,INNERINFONULL - ,INNERSUBJ - ,OUTFLAG - ,PK_ACCSUBJ - ,PK_CORP - ,PK_CREATE_GLORGBOOK - ,PK_GLORGBOOK - ,PK_GRPACCSUBJ - ,PK_SUBJSCHEME - ,PK_SUBJTYPE - ,PROPERTY1 - ,PROPERTY2 - ,PROPERTY3 - ,PROPERTY4 - ,PROPERTY5 - ,REMCODE - ,SEALFLAG - ,STOPED - ,SUBJCODE - ,SUBJLEV - ,SUBJNAME - ,SUMPRINT_LEVEL - ,TS - ,UNIT + dispname + ,dr + ,endflag + ,pk_accsubj + ,pk_corp + ,pk_glorgbook + ,sealflag + ,stoped + ,subjcode + ,subjlev + ,subjname + ,ts @@ -221,73 +58,18 @@ parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity"> select count(1) from ae_conf_bd_accsubj - and ACCREMOVE = #{accremove} - and BALANFLAG = #{balanflag} - and BALANORIENT = #{balanorient} - and BEGINPERIOD = #{beginperiod} - and BEGINYEAR = #{beginyear} - and BOTHORIENT = #{bothorient} - and CASHBANKFLAG = #{cashbankflag} - and CHECKDOUBLE = #{checkdouble} - and CHECKTYPE = #{checktype} - and CREATECORP = #{createcorp} - and CREATEPERIOD = #{createperiod} - and CREATEYEAR = #{createyear} - and CTLSYSTEM = #{ctlsystem} - and CURRENCY = #{currency} - and DISPNAME = #{dispname} - and DR = #{dr} - and ENDFLAG = #{endflag} - and ENDPERIOD = #{endperiod} - and ENDYEAR = #{endyear} - and ENGSUBJNAME = #{engsubjname} - and FREE1 = #{free1} - and FREE10 = #{free10} - and FREE11 = #{free11} - and FREE12 = #{free12} - and FREE13 = #{free13} - and FREE14 = #{free14} - and FREE15 = #{free15} - and FREE16 = #{free16} - and FREE17 = #{free17} - and FREE18 = #{free18} - and FREE19 = #{free19} - and FREE2 = #{free2} - and FREE20 = #{free20} - and FREE3 = #{free3} - and FREE4 = #{free4} - and FREE5 = #{free5} - and FREE6 = #{free6} - and FREE7 = #{free7} - and FREE8 = #{free8} - and FREE9 = #{free9} - and INCURFLAG = #{incurflag} - and INNERINFONULL = #{innerinfonull} - and INNERSUBJ = #{innersubj} - and OUTFLAG = #{outflag} - and PK_ACCSUBJ = #{pkAccsubj} - and PK_CORP = #{pkCorp} - and PK_CREATE_GLORGBOOK = - #{pkCreateGlorgbook} - - and PK_GLORGBOOK = #{pkGlorgbook} - and PK_GRPACCSUBJ = #{pkGrpaccsubj} - and PK_SUBJSCHEME = #{pkSubjscheme} - and PK_SUBJTYPE = #{pkSubjtype} - and PROPERTY1 = #{property1} - and PROPERTY2 = #{property2} - and PROPERTY3 = #{property3} - and PROPERTY4 = #{property4} - and PROPERTY5 = #{property5} - and REMCODE = #{remcode} - and SEALFLAG = #{sealflag} - and STOPED = #{stoped} - and SUBJCODE = #{subjcode} - and SUBJLEV = #{subjlev} - and SUBJNAME = #{subjname} - and SUMPRINT_LEVEL = #{sumprintLevel} - and TS = #{ts} - and UNIT = #{unit} + and dispname = #{dispname} + and dr = #{dr} + and endflag = #{endflag} + and pk_accsubj = #{pkAccsubj} + and pk_corp = #{pkCorp} + and pk_glorgbook = #{pkGlorgbook} + and sealflag = #{sealflag} + and stoped = #{stoped} + and subjcode = #{subjcode} + and subjlev = #{subjlev} + and subjname = #{subjname} + and ts = #{ts} @@ -298,84 +80,18 @@ from ae_conf_bd_accsubj - and ACCREMOVE like concat('%',#{accremove},'%') - and BALANFLAG like concat('%',#{balanflag},'%') - and BALANORIENT like concat('%',#{balanorient},'%') - and BEGINPERIOD like concat('%',#{beginperiod},'%') - - and BEGINYEAR like concat('%',#{beginyear},'%') - and BOTHORIENT like concat('%',#{bothorient},'%') - and CASHBANKFLAG like concat('%',#{cashbankflag},'%') - and CHECKDOUBLE like concat('%',#{checkdouble},'%') - and CHECKTYPE like concat('%',#{checktype},'%') - and CREATECORP like concat('%',#{createcorp},'%') - and CREATEPERIOD like - concat('%',#{createperiod},'%') - - and CREATEYEAR like concat('%',#{createyear},'%') - and CTLSYSTEM like concat('%',#{ctlsystem},'%') - and CURRENCY like concat('%',#{currency},'%') - and DISPNAME like concat('%',#{dispname},'%') - and DR like concat('%',#{dr},'%') - and ENDFLAG like concat('%',#{endflag},'%') - and ENDPERIOD like concat('%',#{endperiod},'%') - and ENDYEAR like concat('%',#{endyear},'%') - and ENGSUBJNAME like concat('%',#{engsubjname},'%') - - and FREE1 like concat('%',#{free1},'%') - and FREE10 like concat('%',#{free10},'%') - and FREE11 like concat('%',#{free11},'%') - and FREE12 like concat('%',#{free12},'%') - and FREE13 like concat('%',#{free13},'%') - and FREE14 like concat('%',#{free14},'%') - and FREE15 like concat('%',#{free15},'%') - and FREE16 like concat('%',#{free16},'%') - and FREE17 like concat('%',#{free17},'%') - and FREE18 like concat('%',#{free18},'%') - and FREE19 like concat('%',#{free19},'%') - and FREE2 like concat('%',#{free2},'%') - and FREE20 like concat('%',#{free20},'%') - and FREE3 like concat('%',#{free3},'%') - and FREE4 like concat('%',#{free4},'%') - and FREE5 like concat('%',#{free5},'%') - and FREE6 like concat('%',#{free6},'%') - and FREE7 like concat('%',#{free7},'%') - and FREE8 like concat('%',#{free8},'%') - and FREE9 like concat('%',#{free9},'%') - and INCURFLAG like concat('%',#{incurflag},'%') - and INNERINFONULL like - concat('%',#{innerinfonull},'%') - - and INNERSUBJ like concat('%',#{innersubj},'%') - and OUTFLAG like concat('%',#{outflag},'%') - and PK_ACCSUBJ like concat('%',#{pkAccsubj},'%') - and PK_CORP like concat('%',#{pkCorp},'%') - and PK_CREATE_GLORGBOOK like - concat('%',#{pkCreateGlorgbook},'%') - - and PK_GLORGBOOK like concat('%',#{pkGlorgbook},'%') - - and PK_GRPACCSUBJ like - concat('%',#{pkGrpaccsubj},'%') - - and PK_SUBJSCHEME like - concat('%',#{pkSubjscheme},'%') - - and PK_SUBJTYPE like concat('%',#{pkSubjtype},'%') - and PROPERTY1 like concat('%',#{property1},'%') - and PROPERTY2 like concat('%',#{property2},'%') - and PROPERTY3 like concat('%',#{property3},'%') - and PROPERTY4 like concat('%',#{property4},'%') - and PROPERTY5 like concat('%',#{property5},'%') - and REMCODE like concat('%',#{remcode},'%') - and SEALFLAG like concat('%',#{sealflag},'%') - and STOPED like concat('%',#{stoped},'%') - and SUBJCODE like concat('%',#{subjcode},'%') - and SUBJLEV like concat('%',#{subjlev},'%') - and SUBJNAME like concat('%',#{subjname},'%') - and SUMPRINT_LEVEL like concat('%',#{sumprintLevel},'%') - and TS like concat('%',#{ts},'%') - and UNIT like concat('%',#{unit},'%') + and dispname like concat('%',#{dispname},'%') + and dr like concat('%',#{dr},'%') + and endflag like concat('%',#{endflag},'%') + and pk_accsubj like concat('%',#{pkAccsubj},'%') + and pk_corp like concat('%',#{pkCorp},'%') + and pk_glorgbook like concat('%',#{pkGlorgbook},'%') + and sealflag like concat('%',#{sealflag},'%') + and stoped like concat('%',#{stoped},'%') + and subjcode like concat('%',#{subjcode},'%') + and subjlev like concat('%',#{subjlev},'%') + and subjname like concat('%',#{subjname},'%') + and ts like concat('%',#{ts},'%') @@ -386,218 +102,23 @@ from ae_conf_bd_accsubj - or ACCREMOVE = #{accremove} - or BALANFLAG = #{balanflag} - or BALANORIENT = #{balanorient} - or BEGINPERIOD = #{beginperiod} - or BEGINYEAR = #{beginyear} - or BOTHORIENT = #{bothorient} - or CASHBANKFLAG = #{cashbankflag} - or CHECKDOUBLE = #{checkdouble} - or CHECKTYPE = #{checktype} - or CREATECORP = #{createcorp} - or CREATEPERIOD = #{createperiod} - or CREATEYEAR = #{createyear} - or CTLSYSTEM = #{ctlsystem} - or CURRENCY = #{currency} - or DISPNAME = #{dispname} - or DR = #{dr} - or ENDFLAG = #{endflag} - or ENDPERIOD = #{endperiod} - or ENDYEAR = #{endyear} - or ENGSUBJNAME = #{engsubjname} - or FREE1 = #{free1} - or FREE10 = #{free10} - or FREE11 = #{free11} - or FREE12 = #{free12} - or FREE13 = #{free13} - or FREE14 = #{free14} - or FREE15 = #{free15} - or FREE16 = #{free16} - or FREE17 = #{free17} - or FREE18 = #{free18} - or FREE19 = #{free19} - or FREE2 = #{free2} - or FREE20 = #{free20} - or FREE3 = #{free3} - or FREE4 = #{free4} - or FREE5 = #{free5} - or FREE6 = #{free6} - or FREE7 = #{free7} - or FREE8 = #{free8} - or FREE9 = #{free9} - or INCURFLAG = #{incurflag} - or INNERINFONULL = #{innerinfonull} - or INNERSUBJ = #{innersubj} - or OUTFLAG = #{outflag} - or PK_ACCSUBJ = #{pkAccsubj} - or PK_CORP = #{pkCorp} - or PK_CREATE_GLORGBOOK = - #{pkCreateGlorgbook} - - or PK_GLORGBOOK = #{pkGlorgbook} - or PK_GRPACCSUBJ = #{pkGrpaccsubj} - or PK_SUBJSCHEME = #{pkSubjscheme} - or PK_SUBJTYPE = #{pkSubjtype} - or PROPERTY1 = #{property1} - or PROPERTY2 = #{property2} - or PROPERTY3 = #{property3} - or PROPERTY4 = #{property4} - or PROPERTY5 = #{property5} - or REMCODE = #{remcode} - or SEALFLAG = #{sealflag} - or STOPED = #{stoped} - or SUBJCODE = #{subjcode} - or SUBJLEV = #{subjlev} - or SUBJNAME = #{subjname} - or SUMPRINT_LEVEL = #{sumprintLevel} - or TS = #{ts} - or UNIT = #{unit} + or dispname = #{dispname} + or dr = #{dr} + or endflag = #{endflag} + or pk_accsubj = #{pkAccsubj} + or pk_corp = #{pkCorp} + or pk_glorgbook = #{pkGlorgbook} + or sealflag = #{sealflag} + or stoped = #{stoped} + or subjcode = #{subjcode} + or subjlev = #{subjlev} + or subjname = #{subjname} + or ts = #{ts} and sts='Y' - - - insert into ae_conf_bd_accsubj( - - ACCREMOVE , - BALANFLAG , - BALANORIENT , - BEGINPERIOD , - BEGINYEAR , - BOTHORIENT , - CASHBANKFLAG , - CHECKDOUBLE , - CHECKTYPE , - CREATECORP , - CREATEPERIOD , - CREATEYEAR , - CTLSYSTEM , - CURRENCY , - DISPNAME , - DR , - ENDFLAG , - ENDPERIOD , - ENDYEAR , - ENGSUBJNAME , - FREE1 , - FREE10 , - FREE11 , - FREE12 , - FREE13 , - FREE14 , - FREE15 , - FREE16 , - FREE17 , - FREE18 , - FREE19 , - FREE2 , - FREE20 , - FREE3 , - FREE4 , - FREE5 , - FREE6 , - FREE7 , - FREE8 , - FREE9 , - INCURFLAG , - INNERINFONULL , - INNERSUBJ , - OUTFLAG , - PK_ACCSUBJ , - PK_CORP , - PK_CREATE_GLORGBOOK , - PK_GLORGBOOK , - PK_GRPACCSUBJ , - PK_SUBJSCHEME , - PK_SUBJTYPE , - PROPERTY1 , - PROPERTY2 , - PROPERTY3 , - PROPERTY4 , - PROPERTY5 , - REMCODE , - SEALFLAG , - STOPED , - SUBJCODE , - SUBJLEV , - SUBJNAME , - SUMPRINT_LEVEL , - TS , - UNIT , - - )values( - - #{accremove} , - #{balanflag} , - #{balanorient} , - #{beginperiod} , - #{beginyear} , - #{bothorient} , - #{cashbankflag} , - #{checkdouble} , - #{checktype} , - #{createcorp} , - #{createperiod} , - #{createyear} , - #{ctlsystem} , - #{currency} , - #{dispname} , - #{dr} , - #{endflag} , - #{endperiod} , - #{endyear} , - #{engsubjname} , - #{free1} , - #{free10} , - #{free11} , - #{free12} , - #{free13} , - #{free14} , - #{free15} , - #{free16} , - #{free17} , - #{free18} , - #{free19} , - #{free2} , - #{free20} , - #{free3} , - #{free4} , - #{free5} , - #{free6} , - #{free7} , - #{free8} , - #{free9} , - #{incurflag} , - #{innerinfonull} , - #{innersubj} , - #{outflag} , - #{pkAccsubj} , - #{pkCorp} , - #{pkCreateGlorgbook} , - #{pkGlorgbook} , - #{pkGrpaccsubj} , - #{pkSubjscheme} , - #{pkSubjtype} , - #{property1} , - #{property2} , - #{property3} , - #{property4} , - #{property5} , - #{remcode} , - #{sealflag} , - #{stoped} , - #{subjcode} , - #{subjlev} , - #{subjname} , - #{sumprintLevel} , - #{ts} , - #{unit} , - - ) - + 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/OrgBookVO.xml index 7d6694eb..aa60d192 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/OrgBookVO.xml @@ -31,27 +31,27 @@ 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 new file mode 100644 index 00000000..cc6b48bd --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.java @@ -0,0 +1,70 @@ +package com.hzya.frame.voucher.ae.comf.module.controller; + +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; +import com.hzya.frame.mdm.mdmModule.service.IMdmModuleService; +import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; +import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; +import com.hzya.frame.mdm.mdmModuleDbFileds.service.IMdmModuleDbFiledsService; +import com.hzya.frame.voucher.ae.comf.module.service.IMdmService; +import com.hzya.frame.web.action.DefaultController; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Created by zydd on 2025-05-26 14:35 + * 查询主数据等一系列操作 + */ +@RestController +@RequestMapping("/ae/conf/mdmfile") +public class MdmFileMappingController extends DefaultController { + + @Autowired + private IMdmModuleService mdmModuleService; + @Autowired + private IMdmModuleDbFiledsService mdmModuleDbFiledsService; + @Autowired + private IMdmService mdmService; + + + @RequestMapping(value = "/queryAll", method = RequestMethod.POST) + public JsonResultEntity queryAll(@RequestBody MdmModuleEntity entity){ + try { + entity.setMdmType("1");//1、档案 2、单据 + List all = mdmModuleService.query(entity); + return getSuccessMessageEntity("请求成功",all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败", e.getMessage()); + } + } + + @RequestMapping(value = "/queryFiledsByDbId", method = RequestMethod.POST) + public JsonResultEntity queryFiledsByDbId(@RequestBody MdmModuleDbFiledsEntity entity){ + try { + List all = mdmModuleDbFiledsService.query(entity); + return getSuccessMessageEntity("请求成功",all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败", e.getMessage()); + } + } + + @RequestMapping(value = "/queryMdmAndFiledsByMdmId", method = RequestMethod.POST) + public JsonResultEntity queryMdmAndFiledsByMdmId(@RequestBody MdmModuleDbEntity entity){ + try { + List all = mdmService.queryMdmAndFiledsByMdmId(entity); + return getSuccessMessageEntity("请求成功",all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败", e.getMessage()); + } + } + + +} diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java index ab16aca7..94d2b5e7 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java @@ -26,7 +26,16 @@ public class MdmModuleEntity extends BaseEntity { private String createUser; //修改人 private String modifyUser; + /** 0：预制 1：手工 */ + private String tag; + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } public String getMdmName() { return mdmName; diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index 8403c031..07618be5 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -19,6 +19,7 @@ + @@ -39,6 +40,7 @@ ,sts ,org_id ,company_id + ,tag