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 b401ee36..cac06b5d 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 @@ -4,12 +4,12 @@ import cn.hutool.core.lang.Assert; 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.entity.AccsubjTreeNode; -import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity; -import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdBdinfoEntity; -import com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO; +import com.hzya.frame.voucher.ae.comf.bd.dao.IU8CQueryVODAO; +import com.hzya.frame.voucher.ae.comf.bd.entity.*; 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; @@ -17,7 +17,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * Created by zydd on 2025-06-04 15:04 @@ -32,6 +34,8 @@ public class BdController extends DefaultController { private IAeConfBdBdinfoDao aeConfBdBdinfoDao; @Autowired private IAeConfBdAccsubjDao aeConfBdAccsubjDao; + @Autowired + private IU8CQueryVODAO u8CQueryVODAO; /** * 查询所有公司账簿信息 @@ -67,7 +71,7 @@ public class BdController extends DefaultController { @RequestMapping(value = "/queryAccSubjByOrgBookId", method = RequestMethod.POST) public JsonResultEntity queryAccSubjByOrgBookId(@RequestBody AeConfBdAccsubjEntity entity) { try { - Assert.notNull(entity.getPkGlorgbook(),"查询科目表时,账簿id不允许为空"); + Assert.notNull(entity.getPkGlorgbook(), "查询科目表时,账簿id不允许为空"); List all = aeConfBdAccsubjDao.query(entity); List tree = AccsubjTreeBuilder.buildTree(all); return getSuccessMessageEntity("请求成功", tree); @@ -77,4 +81,25 @@ public class BdController extends DefaultController { } } + /** + * 查询基础数据数据表 + */ + @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()); + } + } } 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 new file mode 100644 index 00000000..f269d458 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IU8CQueryVODAO.java @@ -0,0 +1,15 @@ +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/U8CQueryVODAOImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/U8CQueryVODAOImpl.java new file mode 100644 index 00000000..da4c26ac --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/U8CQueryVODAOImpl.java @@ -0,0 +1,27 @@ +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/AeConfBdBdinfoEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.java index 078064d5..11a76404 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.java @@ -15,69 +15,69 @@ import lombok.Data; @Data public class AeConfBdBdinfoEntity extends BaseEntity { - @JsonIgnore + private String accessclass; - @JsonIgnore + private String basedoctablename; - @JsonIgnore + private String basedoctablepkname; - @JsonIgnore + private String bdcode; - @JsonIgnore + private String bdname; - @JsonIgnore + private Long bdtype; - @JsonIgnore + private String budgetconst; - @JsonIgnore + private String classcheme; - @JsonIgnore + private String codefieldname; - @JsonIgnore + private String coderulegetter; - @JsonIgnore + private String corpfieldname; - @JsonIgnore + private Long dr; - @JsonIgnore + private String fatherfieldname; - @JsonIgnore + private String funccode; - @JsonIgnore + private String isdef; - @JsonIgnore + private String isincludegroupdata; - @JsonIgnore + private String isparaLevscheme; - @JsonIgnore + private String isselfref; - @JsonIgnore + private String namefieldname; - @JsonIgnore + private String orgbookfieldname; - @JsonIgnore + private String orgtypecode; - @JsonIgnore + private String pkBdinfo; - @JsonIgnore + private String pkCorp; - @JsonIgnore + private String pkDefdef; - @JsonIgnore + private String refnodename; - @JsonIgnore + private String refsystem; - @JsonIgnore + private String reserved1; - @JsonIgnore + private String reserved2; - @JsonIgnore + private String selfrefclass; - @JsonIgnore + private String tablename; - @JsonIgnore + private String tablepkname; - @JsonIgnore + private Date ts; 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/U8CQueryVO.java new file mode 100644 index 00000000..bd57606c --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/U8CQueryVO.java @@ -0,0 +1,33 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +/** + * Created by zydd on 2025-06-06 09:59 + */ +@Data +public class U8CQueryVO extends BaseEntity { + private String tablename; + private String prop1; + private String prop2; + private String prop3; + private String prop4; + private String prop5; + private String prop6; + private String prop7; + private String prop8; + private String prop9; + private String prop10; + + private String propValue1; + private String propValue2; + private String propValue3; + private String propValue4; + private String propValue5; + private String propValue6; + private String propValue7; + private String propValue8; + private String propValue9; + private String propValue10; +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/U8CQueryVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/U8CQueryVO.xml new file mode 100644 index 00000000..d19857fb --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/U8CQueryVO.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.java index f990a09d..17bc3334 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.java @@ -27,15 +27,15 @@ public class AeConfInfluenceFactorEntity extends BaseEntity { */ private String factorName; /** - * 映射档案id + * 映射档案id bd_bdinfo的pkBdinfo */ private String mappingFileId; /** - * 映射档案code + * 映射档案code bd_bdinfo的tablename */ private String mappingFileCode; /** - * 映射档案名称 + * 映射档案名称 bd_bdinfo的bdname */ private String mappingFileName; /** diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java index faed7f4c..e725cbde 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java @@ -70,6 +70,8 @@ public class AeConfInfluenceFactorServiceImpl extends BaseService#{def9} , #{def10} , #{create_time} , - now() , + now() , #{createUser} , #{modify_time} , - now() , + now() , #{modifyUser} , #{sts} , 'Y', diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml index 55e8531a..474930f4 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml @@ -90,7 +90,7 @@ and sourceNames = #{sourceNames} and pk_corp = #{pkCorp} and corp_type = #{corpType} - and desdocid = #{desdocid} + and desdocid = #{desdocId} and pk_setcorp1 = #{pkSetcorp1} and remark = #{remark} and def1 = #{def1} @@ -130,7 +130,7 @@ and sourceNames = #{sourceNames} and pk_corp = #{pkCorp} and corp_type = #{corpType} - and desdocid = #{desdocid} + and desdocid = #{desdocId} and pk_setcorp1 = #{pkSetcorp1} and remark = #{remark} and def1 = #{def1} @@ -173,7 +173,7 @@ and pk_corp like concat('%',#{pkCorp},'%') and corp_type like concat('%',#{corpType},'%') - and desdocid like concat('%',#{desdocid},'%') + and desdocid like concat('%',#{desdocId},'%') and pk_setcorp1 like concat('%',#{pkSetcorp1},'%') and remark like concat('%',#{remark},'%') and def1 like concat('%',#{def1},'%') @@ -210,7 +210,7 @@ or account_book_name = #{accountBookName} or pk_corp = #{pkCorp} or corp_type = #{corpType} - or desdocid = #{desdocid} + or desdocid = #{desdocId} or pk_setcorp1 = #{pkSetcorp1} or remark = #{remark} or def1 = #{def1} @@ -249,7 +249,7 @@ sourceNames , pk_corp , corp_type , - desdocid , + desdocid , pk_setcorp1 , remark , def1 , @@ -285,7 +285,7 @@ #{sourceNames} , #{pkCorp} , #{corpType} , - #{desdocid} , + #{desdocId} , #{pkSetcorp1} , #{remark} , #{def1} , diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java index c20ffe12..7bafe351 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java @@ -16,5 +16,5 @@ public interface IAeConfSubjectContrastService extends IBaseService