From 202db9a448826bfbff169dd7468ee74206141646 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Mon, 16 Jun 2025 10:14:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E3=80=82=202=E3=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E7=B1=BB=E5=AE=9A=E4=B9=89=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=96=B9=E6=B3=95=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 | 17 +++++++ .../ae/comf/bd/dao/IAeConfBdOrgBookVODao.java | 1 + .../bd/dao/impl/AeConfBdOrgBookVODaoImpl.java | 6 +++ .../comf/bd/entity/AeConfBdAccsubjEntity.xml | 4 +- .../ae/comf/bd/entity/vo/MdmDbFiledVO.xml | 5 +- .../ae/comf/bd/entity/vo/OrgBookVO.xml | 28 +++++++++-- .../entity/AeConfSubjectContrastBEntity.java | 50 ------------------- ...eConfSubjectClassificationServiceImpl.java | 2 +- .../AeConfSubjectContrastServiceImpl.java | 2 +- 9 files changed, 57 insertions(+), 58 deletions(-) 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 47717970..48c43b06 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 @@ -45,6 +45,21 @@ public class BdController extends DefaultController { @Autowired private IMdmDbFiledVODAO mdmDbFiledVODAO; + + /** + * 查询所有公司 + */ + @RequestMapping(value = "/queryOrgVO", method = RequestMethod.POST) + public JsonResultEntity queryOrgVO(@RequestBody OrgBookVO vo) { + try { + List all = aeConfBdOrgBookVODao.queryOrgVO(vo); + return getSuccessMessageEntity("请求成功", all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + /** * 查询所有公司账簿信息 */ @@ -81,6 +96,7 @@ public class BdController extends DefaultController { try { MdmDbFiledVO mdmDbFiledVO = new MdmDbFiledVO(); mdmDbFiledVO.setMdmType("1");//1、档案 2、单据 + mdmDbFiledVO.setMdmId(entity.getPkBdinfo()); List all = new ArrayList<>(); List mdmDbFiledVOList = mdmDbFiledVODAO.queryMdmDbFiledVO(mdmDbFiledVO); @@ -88,6 +104,7 @@ public class BdController extends DefaultController { dbFiledVO.setPkBdinfo(dbFiledVO.getMdmId()); dbFiledVO.setBdcode(dbFiledVO.getMdmCode()); dbFiledVO.setBdname(dbFiledVO.getMdmName()); + dbFiledVO.setTablepkname("id"); } if (entity.getMdmName() != null) { 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 8def8bc9..be2db5c4 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 @@ -14,6 +14,7 @@ import java.util.List; public interface IAeConfBdOrgBookVODao extends IBaseDao { public List queryOrgBookVO(OrgBookVO vo); + public List queryOrgVO(OrgBookVO vo); } 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 26d98ef4..afa003a8 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 @@ -17,4 +17,10 @@ public class AeConfBdOrgBookVODaoImpl extends MybatisGenericDao orgBookVOList = (List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdOrgBookVODaoImpl.queryOrgBookVO", vo); return orgBookVOList; } + + @Override + public List queryOrgVO(OrgBookVO vo) { + List orgBookVOList = (List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdOrgBookVODaoImpl.queryOrgVO", vo); + return orgBookVOList; + } } 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 2abb57f4..11a65d53 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 @@ -3,6 +3,7 @@ + @@ -17,7 +18,8 @@ - dispname + id + ,dispname ,dr ,endflag ,pk_accsubj 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 index 042478f7..a91e7ada 100644 --- 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 @@ -36,8 +36,8 @@ db.db_name as tablename, db.remark as dbName, fileds.sys_pk as tablepkname, - fileds.sys_code as namefieldname, - fileds.sys_name as codefieldname + fileds.sys_code AS codefieldname, + fileds.sys_name AS namefieldname FROM mdm_module mdm LEFT JOIN mdm_module_db db ON db.mdm_id = mdm.id @@ -49,6 +49,7 @@ GROUP BY db_id) fileds ON fileds.db_id = db.id WHERE 1=1 + and mdm.id = #{mdmId} AND mdm.sts = 'Y' AND db.db_type = '1' diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.xml index da39da3c..26b5cd12 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.xml @@ -46,13 +46,35 @@ LEFT JOIN mdm_bd_glorg glorg ON glorg.pk_glorg=glorgbook.pk_glorg LEFT JOIN mdm_bd_glbook glbook ON glbook.pk_glbook=glorgbook.pk_glbook - and glorg.pk_entityorg = #{pkentityorg} - and glorg.glorgcode = #{glorgcode} - and glorg.glorgname = #{glorgname} + and glorg.pk_entityorg like concat('%',#{pkentityorg},'%') + and glorg.gl_orgcode like concat('%',#{glorgcode},'%') + and glorg.gl_orgname like concat('%',#{glorgname},'%') + and glorgbook.dr=0 order by glorgbook.pk_glorg asc + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java index 37801763..d034e14c 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java @@ -18,227 +18,177 @@ public class AeConfSubjectContrastBEntity extends BaseEntity { /** * 对照表id */ - @JsonIgnore private Long contrastId; /** * 公司pk */ - @JsonIgnore private String pkCorp; private String glorgname; /** * 目标档案id */ - @JsonIgnore private String pkAccsubj; /** * 目标档案值（会计科目) */ - @JsonIgnore private String desdocvalue; /** * 来源档案表1 */ - @JsonIgnore private String factortable1; /** * 来源档案表2 */ - @JsonIgnore private String factortable2; /** * 来源档案表3 */ - @JsonIgnore private String factortable3; /** * 来源档案表4 */ - @JsonIgnore private String factortable4; /** * 来源档案表5 */ - @JsonIgnore private String factortable5; /** * 来源档案表6 */ - @JsonIgnore private String factortable6; /** * 来源档案表7 */ - @JsonIgnore private String factortable7; /** * 来源档案表8 */ - @JsonIgnore private String factortable8; /** * 来源档案表9 */ - @JsonIgnore private String factortable9; /** * 来源档案主键1 */ - @JsonIgnore private String factorpk1; /** * 来源档案主键2 */ - @JsonIgnore private String factorpk2; /** * 来源档案主键3 */ - @JsonIgnore private String factorpk3; /** * 来源档案主键4 */ - @JsonIgnore private String factorpk4; /** * 来源档案主键5 */ - @JsonIgnore private String factorpk5; /** * 来源档案主键6 */ - @JsonIgnore private String factorpk6; /** * 来源档案主键7 */ - @JsonIgnore private String factorpk7; /** * 来源档案主键8 */ - @JsonIgnore private String factorpk8; /** * 来源档案主键9 */ - @JsonIgnore private String factorpk9; /** * 来源档案值1 */ - @JsonIgnore private String factorid1; /** * 来源档案值2 */ - @JsonIgnore private String factorid2; /** * 来源档案值3 */ - @JsonIgnore private String factorid3; /** * 来源档案值4 */ - @JsonIgnore private String factorid4; /** * 来源档案值5 */ - @JsonIgnore private String factorid5; /** * 来源档案值6 */ - @JsonIgnore private String factorid6; /** * 来源档案值7 */ - @JsonIgnore private String factorid7; /** * 来源档案值8 */ - @JsonIgnore private String factorid8; /** * 来源档案值9 */ - @JsonIgnore private String factorid9; /** * 来源档案名称1 */ - @JsonIgnore private String factorname1; /** * 来源档案名称2 */ - @JsonIgnore private String factorname2; /** * 来源档案名称3 */ - @JsonIgnore private String factorname3; /** * 来源档案名称4 */ - @JsonIgnore private String factorname4; /** * 来源档案名称5 */ - @JsonIgnore private String factorname5; /** * 来源档案名称6 */ - @JsonIgnore private String factorname6; /** * 来源档案名称7 */ - @JsonIgnore private String factorname7; /** * 来源档案名称8 */ - @JsonIgnore private String factorname8; /** * 来源档案名称9 */ - @JsonIgnore private String factorname9; /** * 备注 */ private String remark; - @JsonIgnore private String def1; - @JsonIgnore private String def2; - @JsonIgnore private String def3; - @JsonIgnore private String def4; - @JsonIgnore private String def5; - @JsonIgnore private String def6; - @JsonIgnore private String def7; - @JsonIgnore private String def8; - @JsonIgnore private String def9; - @JsonIgnore private String def10; /** * 创建人 diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java index e5e74244..e5902408 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java @@ -110,7 +110,7 @@ public class AeConfSubjectClassificationServiceImpl extends BaseService query = iAeConfInfluenceFactorService.query(aeConfInfluenceFactorEntity); if (query.size() == 0 || query.size() > 1) { - Assert.state(false, "根据模块id：{}，影响因素id：{}，未查询到或查到多个影响因素配置，请检查"); + Assert.state(false, "根据模块id：{}，影响因素id：{}，未查询到或查到多个影响因素配置，请检查", moduleId, sourceId); } sourceIdList.add(query.get(0).getMappingFileId()); }