1、优化查询档案，科目表，档案类主数据查询的优化等。

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java

@@ -3,17 +3,14 @@ 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.*;
-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.dao.IU8CQueryVODAO;
 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.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;
@@ -40,11 +37,14 @@ public class BdController extends DefaultController {
     @Autowired
     private IAeConfBdAccsubjDao aeConfBdAccsubjDao;
     @Autowired
-    private IU8CQueryVODAO u8CQueryVODAO;
+    private IMdmDBQueryVODAO mdmDBQueryVODAO;
 
     @Autowired
     private IMdmModuleService mdmModuleService;
 
+    @Autowired
+    private IMdmDbFiledVODAO mdmDbFiledVODAO;
+
     /**
      * 查询所有公司账簿信息
      */
@@ -72,24 +72,27 @@ public class BdController extends DefaultController {
 //            return getFailureMessageEntity("请求失败", e.getMessage());
 //        }
 //    }
+
     /**
      * 查询基础数据资源表
      */
     @RequestMapping(value = "/queryBdinfoList", method = RequestMethod.POST)
-    public JsonResultEntity queryMdmfileList(@RequestBody MdmModuleEntity entity) {
+    public JsonResultEntity queryBdinfoList(@RequestBody MdmDbFiledVO entity) {
         try {
-            MdmModuleEntity mdmModuleEntity1 = new MdmModuleEntity();
+            MdmDbFiledVO mdmDbFiledVO = new MdmDbFiledVO();
-            mdmModuleEntity1.setMdmType("1");//1、档案 2、单据
+            mdmDbFiledVO.setMdmType("1");//1、档案 2、单据
-            List<MdmModuleEntity> all = new ArrayList<>();
+            List<MdmDbFiledVO> all = new ArrayList<>();
-            List<MdmModuleEntity> mdmModuleEntityList = mdmModuleService.query(mdmModuleEntity1);
+            List<MdmDbFiledVO> mdmDbFiledVOList = mdmDbFiledVODAO.queryMdmDbFiledVO(mdmDbFiledVO);
+
+
             if (entity.getMdmName() != null) {
-                for (MdmModuleEntity mdmModuleEntity : mdmModuleEntityList) {
+                for (MdmDbFiledVO mdmDbFiled : mdmDbFiledVOList) {
-                    if (mdmModuleEntity.getMdmName().contains(entity.getMdmName())) {
+                    if (mdmDbFiled.getMdmName().contains(entity.getMdmName())) {
-                        all.add(mdmModuleEntity);
+                        all.add(mdmDbFiled);
                     }
                 }
             } else {
-                all = mdmModuleEntityList;
+                all = mdmDbFiledVOList;
             }
             return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
@@ -114,20 +117,38 @@ public class BdController extends DefaultController {
         }
     }
 
+//    /**
+//     * 查询基础数据数据表，直连U8C数据库
+//     */
+//    @RequestMapping(value = "/queryDataByMap", method = RequestMethod.POST)
+//    public JsonResultEntity queryDataByMap(@RequestBody HashMap<String, String> 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<Map<String, Object>> objectList = u8CQueryVODAO.queryU8CBD(u8CQueryVO);
+//
+//            return getSuccessMessageEntity("请求成功", objectList);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return getFailureMessageEntity("请求失败", e.getMessage());
+//        }
+//    }
+
     /**
-     * 查询基础数据数据表
+     * 查询基础数据数据表，查询本地库
      */
     @RequestMapping(value = "/queryDataByMap", method = RequestMethod.POST)
-    public JsonResultEntity queryDataByMap(@RequestBody HashMap<String, String> map) {
+    public JsonResultEntity queryDataByMap(@RequestBody MdmDBQueryVO mdmDBQueryVO) {
         try {
-            if (map.get("tablename") == null || "".equals(map.get("tablename"))) {
+            if (mdmDBQueryVO.getTablename() == null || "".equals(mdmDBQueryVO.getTablename())) {
                 return getSuccessMessageEntity("请求成功", null);
             }
-            //查询u8c数据库
+            List<Map<String, Object>> objectList = mdmDBQueryVODAO.queryMdmDb(mdmDBQueryVO);
-            U8CQueryVO u8CQueryVO = new U8CQueryVO();
-            u8CQueryVO.setDataSourceCode(ProfilesActiveConstant.LETS_PROD_DATE_SOURCE);
-            u8CQueryVO.setTablename(map.get("tablename"));
-            List<Map<String, Object>> objectList = u8CQueryVODAO.queryU8CBD(u8CQueryVO);
 
             return getSuccessMessageEntity("请求成功", objectList);
         } catch (Exception e) {
@@ -140,17 +161,13 @@ public class BdController extends DefaultController {
      * 查询基础数据数据表
      */
     @RequestMapping(value = "/queryDataPagedByMap", method = RequestMethod.POST)
-    public JsonResultEntity queryDataPagedByMap(@RequestBody U8CQueryVO entity) {
+    public JsonResultEntity queryDataPagedByMap(@RequestBody MdmDBQueryVO mdmDBQueryVO) {
         try {
-            if (entity.getTablename() == null || "".equals(entity.getTablename())) {
+            if (mdmDBQueryVO.getTablename() == null || "".equals(mdmDBQueryVO.getTablename())) {
                 return getSuccessMessageEntity("请求成功", null);
             }
-            PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
+            PageHelper.startPage(mdmDBQueryVO.getPageNum(), mdmDBQueryVO.getPageSize());
-            //查询u8c数据库
+            List<Map<String, Object>> objectList = mdmDBQueryVODAO.queryMdmDb(mdmDBQueryVO);
-            U8CQueryVO u8CQueryVO = new U8CQueryVO();
-            u8CQueryVO.setDataSourceCode(ProfilesActiveConstant.LETS_PROD_DATE_SOURCE);
-            u8CQueryVO.setTablename(entity.getTablename());
-            List<Map<String, Object>> objectList = u8CQueryVODAO.queryU8CBD(u8CQueryVO);
             PageInfo pageInfo = new PageInfo(objectList);
 
             return getSuccessMessageEntity("请求成功", pageInfo);

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java

@@ -1,8 +1,7 @@
 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.vo.OrgBookVO;
-import com.hzya.frame.voucher.ae.comf.module.entity.AeConfBusinessModuleEntity;
 
 import java.util.List;
 

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java

@@ -0,0 +1,14 @@
+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.MdmDBQueryVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by zydd on 2025-06-06 10:03
+ */
+public interface IMdmDBQueryVODAO extends IBaseDao<MdmDBQueryVO, String> {
+    List<Map<String, Object>> queryMdmDb(MdmDBQueryVO u8CQueryVO);
+}

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDbFiledVODAO.java

@@ -0,0 +1,14 @@
+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.MdmDbFiledVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by zydd on 2025-06-06 10:03
+ */
+public interface IMdmDbFiledVODAO extends IBaseDao<MdmDbFiledVO, String> {
+    public List<MdmDbFiledVO> queryMdmDbFiledVO(MdmDbFiledVO vo);
+}

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IU8CQueryVODAO.java

@@ -1,15 +0,0 @@
-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<U8CQueryVO, String> {
-    List<Map<String, Object>> queryU8CBD(U8CQueryVO u8CQueryVO);
-}

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java

@@ -2,7 +2,7 @@ package com.hzya.frame.voucher.ae.comf.bd.dao.impl;
 
 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.entity.OrgBookVO;
+import com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java

@@ -0,0 +1,21 @@
+package com.hzya.frame.voucher.ae.comf.bd.dao.impl;
+
+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.MdmDBQueryVO;
+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 MdmDBQueryVODAOImpl extends MybatisGenericDao<MdmDBQueryVO, String> implements IMdmDBQueryVODAO {
+    @Override
+    public List<Map<String, Object>> queryMdmDb(MdmDBQueryVO u8CQueryVO) {
+        List<Map<String, Object>> maps = (List<Map<String, Object>>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryMdmDb", u8CQueryVO);
+        return maps;
+    }
+}

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDbFiledVODAOImpl.java

@@ -0,0 +1,21 @@
+package com.hzya.frame.voucher.ae.comf.bd.dao.impl;
+
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDbFiledVODAO;
+import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDbFiledVO;
+import com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by zydd on 2025-06-12 10:26
+ */
+@Service
+public class MdmDbFiledVODAOImpl extends MybatisGenericDao<MdmDbFiledVO, String> implements IMdmDbFiledVODAO {
+    @Override
+    public List<MdmDbFiledVO> queryMdmDbFiledVO(MdmDbFiledVO vo) {
+        List<MdmDbFiledVO> mdmDbFiledVOList = (List<MdmDbFiledVO>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDbFiledVODAOImpl.queryMdmDbFiledVO", vo);
+        return mdmDbFiledVOList;
+    }
+}

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/U8CQueryVODAOImpl.java

@@ -1,27 +0,0 @@
-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<U8CQueryVO, String> implements IU8CQueryVODAO {
-    @Override
-    @DS(ProfilesActiveConstant.LETS_PROD_DATE_SOURCE)
-    public List<Map<String, Object>> queryU8CBD(U8CQueryVO u8CQueryVO) {
-
-        List<Map<String, Object>> maps = (List<Map<String, Object>>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.U8CQueryVODAOImpl.queryU8CBD", u8CQueryVO);
-        return maps;
-    }
-}

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.xml

@@ -35,7 +35,7 @@
             parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
         select
         <include refid="AeConfBdAccsubjEntity_Base_Column_List"/>
-        from ae_conf_bd_accsubj
+        from mdm_bd_accsubj
         <trim prefix="where" prefixOverrides="and">
             <if test="dispname != null and dispname != ''">and dispname = #{dispname}</if>
             <if test="dr != null">and dr = #{dr}</if>
@@ -50,13 +50,13 @@
             <if test="subjname != null and subjname != ''">and subjname = #{subjname}</if>
             <if test="ts != null">and ts = #{ts}</if>
         </trim>
-        ORDER BY ae_conf_bd_accsubj.subjcode ASC
+        ORDER BY mdm_bd_accsubj.subjcode ASC
     </select>
 
     <!-- 查询符合条件的数量 -->
     <select id="entity_count" resultType="Integer"
             parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
-        select count(1) from ae_conf_bd_accsubj
+        select count(1) from mdm_bd_accsubj
         <trim prefix="where" prefixOverrides="and">
             <if test="dispname != null and dispname != ''">and dispname = #{dispname}</if>
             <if test="dr != null">and dr = #{dr}</if>
@@ -78,7 +78,7 @@
             parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
         select
         <include refid="AeConfBdAccsubjEntity_Base_Column_List"/>
-        from ae_conf_bd_accsubj
+        from mdm_bd_accsubj
         <trim prefix="where" prefixOverrides="and">
             <if test="dispname != null and dispname != ''">and dispname like concat('%',#{dispname},'%')</if>
             <if test="dr != null">and dr like concat('%',#{dr},'%')</if>
@@ -100,7 +100,7 @@
             parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
         select
         <include refid="AeConfBdAccsubjEntity_Base_Column_List"/>
-        from ae_conf_bd_accsubj
+        from mdm_bd_accsubj
         <trim prefix="where" prefixOverrides="and">
             <if test="dispname != null and dispname != ''">or dispname = #{dispname}</if>
             <if test="dr != null">or dr = #{dr}</if>

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/U8CQueryVO.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.voucher.ae.comf.bd.dao.impl.U8CQueryVODAOImpl">
-
-    <resultMap id="get-U8CQueryVO-result" type="com.hzya.frame.voucher.ae.comf.bd.entity.U8CQueryVO">
-        <result property="tablename" column="tablename" />
-    </resultMap>
-
-
-    <select id="queryU8CBD" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.U8CQueryVO" resultType="map">
-        select
-        *
-        from
-        ${tablename}
-        <trim prefix="where" prefixOverrides="and">
-            <if test="prop1 !=null and prop1 !=''">and #{prop1}=#{propValue1}</if>
-            <if test="prop2 !=null and prop2 !=''">and #{prop2}=#{propValue2}</if>
-            <if test="prop3 !=null and prop3 !=''">and #{prop3}=#{propValue3}</if>
-            <if test="prop4 !=null and prop4 !=''">and #{prop4}=#{propValue4}</if>
-            <if test="prop5 !=null and prop5 !=''">and #{prop5}=#{propValue5}</if>
-            <if test="prop6 !=null and prop6 !=''">and #{prop6}=#{propValue6}</if>
-            <if test="prop7 !=null and prop7 !=''">and #{prop7}=#{propValue7}</if>
-            <if test="prop8 !=null and prop8 !=''">and #{prop8}=#{propValue8}</if>
-            <if test="prop9 !=null and prop9 !=''">and #{prop9}=#{propValue9}</if>
-            <if test="prop10 !=null and prop10 !=''">and #{prop10}=#{propValue10}</if>
-        </trim>
-    </select>
-
-</mapper>
-

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java

@@ -1,4 +1,4 @@
-package com.hzya.frame.voucher.ae.comf.bd.entity;
+package com.hzya.frame.voucher.ae.comf.bd.entity.vo;
 
 import com.hzya.frame.web.entity.BaseEntity;
 import lombok.Data;
@@ -7,7 +7,7 @@ import lombok.Data;
  * Created by zydd on 2025-06-06 09:59
  */
 @Data
-public class U8CQueryVO extends BaseEntity {
+public class MdmDBQueryVO extends BaseEntity {
     private String tablename;
     private String prop1;
     private String prop2;

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl">
+
+    <resultMap id="get-U8CQueryVO-result" type="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO">
+        <result property="tablename" column="tablename" />
+    </resultMap>
+
+
+    <select id="queryMdmDb" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO" resultType="map">
+        select
+        *
+        from
+        ${tablename}
+        <trim prefix="where" prefixOverrides="and">
+
+            <if test="prop1 !=null and propValue1 != null">${prop1} like concat('%', #{propValue1},'%')</if>
+            <if test="prop2 !=null and propValue2 != null">${prop2}like concat('%', #{propValue2},'%')</if>
+            <if test="prop3 !=null and propValue3 != null">${prop3}like concat('%', #{propValue3},'%')</if>
+            <if test="prop4 !=null and propValue4 != null">${prop4}like concat('%', #{propValue4},'%')</if>
+            <if test="prop5 !=null and propValue5 != null">${prop5}like concat('%', #{propValue5},'%')</if>
+            <if test="prop6 !=null and propValue6 != null">${prop6}like concat('%', #{propValue6},'%')</if>
+            <if test="prop7 !=null and propValue7 != null">${prop7}like concat('%', #{propValue7},'%')</if>
+            <if test="prop8 !=null and propValue8 != null">${prop8}like concat('%', #{propValue8},'%')</if>
+            <if test="prop9 !=null and propValue9 != null">${prop9}like concat('%', #{propValue9},'%')</if>
+            <if test="prop10 !=null and propValue10 != null">${prop10}like concat('%', #{propValue10},'%')</if>
+        </trim>
+    </select>
+
+</mapper>
+

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.java

@@ -0,0 +1,34 @@
+package com.hzya.frame.voucher.ae.comf.bd.entity.vo;
+
+import com.hzya.frame.web.entity.BaseEntity;
+import lombok.Data;
+
+/**
+ * 主数据模版(MdmModule)实体类
+ *
+ * @author makejava
+ * @since 2024-06-03 08:46:29
+ */
+@Data
+public class MdmDbFiledVO extends BaseEntity {
+    private String mdmType;
+    /** 档案id */
+    private String mdmId;
+    /** 档案编码 */
+    private String mdmCode;
+    /** 档案名称 */
+    private String mdmName;
+    /** 表id */
+    private String dbId;
+    /** 对应表名 */
+    private String tablename;
+    /** 表中文名称 */
+    private String dbName;
+    /** 对应主键名 */
+    private String tablepkname;
+    /** 名称字段 */
+    private String namefieldname;
+    /** 编码字段名称 */
+    private String codefieldname;
+}
+

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDbFiledVODAOImpl">
+
+    <resultMap id="get-MdmDbFiledVO-result" type="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDbFiledVO">
+        <result property="mdmId" column="mdmId"/>
+        <result property="mdmCode" column="mdmCode"/>
+        <result property="mdmName" column="mdmName"/>
+        <result property="dbId" column="dbId"/>
+        <result property="tablename" column="tablename"/>
+        <result property="dbName" column="dbName"/>
+        <result property="tablepkname" column="tablepkname"/>
+        <result property="namefieldname" column="namefieldname"/>
+        <result property="codefieldname" column="codefieldname"/>
+    </resultMap>
+    <!-- 查询的字段-->
+    <sql id="OrgBookVO_Base_Column_List">
+        mdmId,
+        mdmCode,
+        mdmName,
+        dbId,
+        tablename,
+        dbName,
+        tablepkname,
+        namefieldname,
+        codefieldname,
+    </sql>
+    <!-- 查询 采用==查询 -->
+    <select id="queryMdmDbFiledVO" resultMap="get-MdmDbFiledVO-result"
+            parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDbFiledVO">
+        SELECT
+            mdm.id          as mdmId,
+            mdm.mdm_code    as mdmCode,
+            mdm.mdm_name    as mdmName,
+            db.id           as dbId,
+            db.db_name      as tablename,
+            db.remark       as dbName,
+            fileds.sys_pk   as tablepkname,
+            fileds.sys_code as namefieldname,
+            fileds.sys_name as codefieldname
+        FROM
+            mdm_module mdm
+            LEFT JOIN mdm_module_db db ON db.mdm_id = mdm.id
+            LEFT JOIN (SELECT db_id,
+                              MAX(CASE WHEN sys_pk = 'Y' THEN en_name ELSE NULL END)   AS sys_pk,
+                              MAX(CASE WHEN sys_code = 'Y' THEN en_name ELSE NULL END) AS sys_code,
+                              MAX(CASE WHEN sys_name = 'Y' THEN en_name ELSE NULL END) AS sys_name
+                       FROM mdm_module_db_fileds
+                       GROUP BY db_id) fileds ON fileds.db_id = db.id
+        WHERE
+            1=1
+            AND mdm.sts = 'Y'
+            AND db.db_type = '1'
+    </select>
+
+</mapper>
+

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.java

@@ -1,4 +1,4 @@
-package com.hzya.frame.voucher.ae.comf.bd.entity;
+package com.hzya.frame.voucher.ae.comf.bd.entity.vo;
 
 import com.hzya.frame.web.entity.BaseEntity;
 import lombok.Data;

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdOrgBookVODaoImpl">
 
-    <resultMap id="get-OrgBookVO-result" type="com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO">
+    <resultMap id="get-OrgBookVO-result" type="com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO">
         <result property="pkentityorg" column="pkentityorg" jdbcType="INTEGER"/>
         <result property="glorgcode" column="glorgcode" jdbcType="VARCHAR"/>
         <result property="glorgname" column="glorgname" jdbcType="VARCHAR"/>
@@ -29,15 +29,15 @@
     </sql>
     <!-- 查询 采用==查询 -->
     <select id="queryOrgBookVO" resultMap="get-OrgBookVO-result"
-            parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO">
+            parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO">
         SELECT
             glorgbook.pk_glorgbook AS pkglorgbook,
             glorgbook.gl_orgbook_code AS glorgbookcode,
             glorgbook.gl_orgbook_name AS glorgbookname,
-            glorgbook.pk_glorg AS pkentityorg,
+            glorg.pk_entityorg AS pkentityorg,
             glorg.gl_orgcode AS glorgcode,
-            glorg.gl_orgname AS gl_orgname,
+            glorg.gl_orgname AS glorgname,
-            glorgbook.pk_glbook AS pk_glbook,
+            glorgbook.pk_glbook AS pkglbook,
             glbook.code AS glbookcode,
             glbook.name AS glbookname,
             glorgbook.ts AS ts