From 9c111bb93a320d86da8ffc82ce9b38631d31d5f7 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Tue, 29 Jul 2025 23:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ae/comf/bd/controller/BdController.java | 3 +- .../ae/comf/bd/entity/vo/MdmDBQueryVO.xml | 15 ++- ...InfluenceFactorCorrelationServiceImpl.java | 8 +- .../entity/AeConfSubjectContrastBEntity.java | 108 +++++++++--------- .../entity/AeConfSubjectContrastBEntity.xml | 6 +- .../AeConfSubjectContrastBServiceImpl.java | 57 ++++++++- .../AeConfSubjectContrastServiceImpl.java | 70 +++++++++++- 7 files changed, 198 insertions(+), 69 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 17d9a24e..a7bc7ef7 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 @@ -108,7 +108,8 @@ public class BdController extends DefaultController { dbFiledVO.setPkBdinfo(dbFiledVO.getMdmId()); dbFiledVO.setBdcode(dbFiledVO.getMdmCode()); dbFiledVO.setBdname(dbFiledVO.getMdmName()); - dbFiledVO.setTablepkname("id"); +// dbFiledVO.setTablepkname("id"); + dbFiledVO.setTablepkname(dbFiledVO.getTablepkname()); } if (entity.getMdmName() != null) { 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 199a1414..68725379 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 @@ -28,13 +28,16 @@ ${prop6}=#{propValue6} - and ${prop7}=#{propValue7} - or ${prop8}=#{propValue8} + and ${prop7}=#{propValue7} + or ${prop8}=#{propValue8} ${prop9}=#{propValue9} ${prop10}=#{propValue10} + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java index c299d501..d71de402 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java @@ -57,8 +57,8 @@ public class AeConfInfluenceFactorCorrelationServiceImpl extends BaseService saveList = new ArrayList<>(); @@ -81,8 +81,8 @@ public class AeConfInfluenceFactorCorrelationServiceImpl extends BaseService updateList = new ArrayList<>(); 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 d034e14c..f56931c7 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,186 +18,186 @@ public class AeConfSubjectContrastBEntity extends BaseEntity { /** * 对照表id */ - private Long contrastId; + public Long contrastId; /** * 公司pk */ - private String pkCorp; - private String glorgname; + public String pkCorp; + public String glorgname; /** * 目标档案id */ - private String pkAccsubj; + public String pkAccsubj; /** * 目标档案值（会计科目) */ - private String desdocvalue; + public String desdocvalue; /** * 来源档案表1 */ - private String factortable1; + public String factortable1; /** * 来源档案表2 */ - private String factortable2; + public String factortable2; /** * 来源档案表3 */ - private String factortable3; + public String factortable3; /** * 来源档案表4 */ - private String factortable4; + public String factortable4; /** * 来源档案表5 */ - private String factortable5; + public String factortable5; /** * 来源档案表6 */ - private String factortable6; + public String factortable6; /** * 来源档案表7 */ - private String factortable7; + public String factortable7; /** * 来源档案表8 */ - private String factortable8; + public String factortable8; /** * 来源档案表9 */ - private String factortable9; + public String factortable9; /** * 来源档案主键1 */ - private String factorpk1; + public String factorpk1; /** * 来源档案主键2 */ - private String factorpk2; + public String factorpk2; /** * 来源档案主键3 */ - private String factorpk3; + public String factorpk3; /** * 来源档案主键4 */ - private String factorpk4; + public String factorpk4; /** * 来源档案主键5 */ - private String factorpk5; + public String factorpk5; /** * 来源档案主键6 */ - private String factorpk6; + public String factorpk6; /** * 来源档案主键7 */ - private String factorpk7; + public String factorpk7; /** * 来源档案主键8 */ - private String factorpk8; + public String factorpk8; /** * 来源档案主键9 */ - private String factorpk9; + public String factorpk9; /** * 来源档案值1 */ - private String factorid1; + public String factorid1; /** * 来源档案值2 */ - private String factorid2; + public String factorid2; /** * 来源档案值3 */ - private String factorid3; + public String factorid3; /** * 来源档案值4 */ - private String factorid4; + public String factorid4; /** * 来源档案值5 */ - private String factorid5; + public String factorid5; /** * 来源档案值6 */ - private String factorid6; + public String factorid6; /** * 来源档案值7 */ - private String factorid7; + public String factorid7; /** * 来源档案值8 */ - private String factorid8; + public String factorid8; /** * 来源档案值9 */ - private String factorid9; + public String factorid9; /** * 来源档案名称1 */ - private String factorname1; + public String factorname1; /** * 来源档案名称2 */ - private String factorname2; + public String factorname2; /** * 来源档案名称3 */ - private String factorname3; + public String factorname3; /** * 来源档案名称4 */ - private String factorname4; + public String factorname4; /** * 来源档案名称5 */ - private String factorname5; + public String factorname5; /** * 来源档案名称6 */ - private String factorname6; + public String factorname6; /** * 来源档案名称7 */ - private String factorname7; + public String factorname7; /** * 来源档案名称8 */ - private String factorname8; + public String factorname8; /** * 来源档案名称9 */ - private String factorname9; + public String factorname9; /** * 备注 */ - private String remark; - private String def1; - private String def2; - private String def3; - private String def4; - private String def5; - private String def6; - private String def7; - private String def8; - private String def9; - private String def10; + public String remark; + public String def1; + public String def2; + public String def3; + public String def4; + public String def5; + public String def6; + public String def7; + public String def8; + public String def9; + public String def10; /** * 创建人 */ - private String createUser; + public String createUser; /** * 修改人 */ - private String modifyUser; + public String modifyUser; } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml index 90bdae1c..86e4652f 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml @@ -9,7 +9,7 @@ - + @@ -69,7 +69,7 @@ ,contrast_id ,pk_corp ,glorgname - ,pkAccsubj + ,pk_accsubj ,desdocvalue ,factortable1 ,factortable2 @@ -383,7 +383,7 @@ pk_corp , glorgname , desdocvalue , - pkAccsubj , + pk_accsubj , factortable1 , factortable2 , factortable3 , diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java index 0b61f92f..630269d9 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java @@ -45,6 +45,9 @@ public class AeConfSubjectContrastBServiceImpl extends BaseService query = aeConfSubjectContrastBDao.query(aeConfSubjectContrastBEntity); + for (AeConfSubjectContrastBEntity confSubjectContrastBEntity : query) { + transFactorname(confSubjectContrastBEntity); + } return query; } @@ -75,6 +78,7 @@ public class AeConfSubjectContrastBServiceImpl extends BaseService updateList(List list) { if (list == null || list.size() == 0) { @@ -100,9 +104,56 @@ public class AeConfSubjectContrastBServiceImpl extends BaseService queryAll(AeConfSubjectContrastEntity entity) { @@ -48,6 +52,9 @@ public class AeConfSubjectContrastServiceImpl extends BaseService aeConfSubjectContrastBEntityList = aeConfSubjectContrastBDao.query(aeConfSubjectContrastBEntity); + for (AeConfSubjectContrastBEntity confSubjectContrastBEntity : aeConfSubjectContrastBEntityList) { + transFactorname(confSubjectContrastBEntity); + } confSubjectContrastEntity.setContrastBEntityList(aeConfSubjectContrastBEntityList); } return aeConfSubjectContrastEntityList; @@ -136,6 +143,7 @@ public class AeConfSubjectContrastServiceImpl extends BaseService aeConfSubjectClassificationEntityList = aeConfSubjectClassificationDao.query(aeConfSubjectClassificationEntity); + for (AeConfSubjectClassificationEntity confSubjectClassificationEntity : aeConfSubjectClassificationEntityList) { + confSubjectClassificationEntity.setContrastId(aeConfSubjectContrastEntity1.getId()); + confSubjectClassificationEntity.setContrastCode(aeConfSubjectContrastEntity1.getCode()); + confSubjectClassificationEntity.setContrastName(aeConfSubjectContrastEntity1.getName()); + aeConfSubjectClassificationDao.update(confSubjectClassificationEntity); + } + return null; } @@ -199,4 +219,52 @@ public class AeConfSubjectContrastServiceImpl extends BaseService