diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java index c7d9e904..74c5e2b9 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java @@ -24,7 +24,6 @@ import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao; import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; import com.hzya.frame.sysnew.application.dao.ISysApplicationDao; import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; -import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; import com.hzya.frame.sysnew.application.script.dao.ISysApplicationScriptDao; import com.hzya.frame.sysnew.application.script.entity.SysApplicationScriptEntity; import com.hzya.frame.sysnew.grovy.service.IGroovyIntegrationService; @@ -47,11 +46,7 @@ import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 主数据模版(MdmModule)表服务接口 @@ -296,7 +291,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { for (int i = 0; i < mdmModuleDbEntities.size(); i++) { if("2".equals(mdmModuleDbEntities.get(i).getDbType())){ - Map map = new HashMap<>(); + Map map = new HashMap<>(); map.put("tableName",mdmModuleDbEntities.get(i).getDbName()); map.put("formmainId",object.getString("id")); List detail = mdmModuleDao.queryMdmSTDetail(map); @@ -1017,7 +1012,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { for (int i = 0; i < mdmModuleDbEntities.size(); i++) { if("2".equals(mdmModuleDbEntities.get(i).getDbType())){ - Map map = new HashMap<>(); + Map map = new HashMap<>(); map.put("tableName",mdmModuleDbEntities.get(i).getDbName()); map.put("formmainId",object.getString("id")); List detail = mdmModuleDao.queryMdmSTDetail(map); diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java index be40977f..6c0b67fd 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java @@ -20,6 +20,8 @@ public class MdmQuery { private List returnField; //明细表查询条件 private List detailQueryCondition; + //小写字段 + private List fields; public Integer getPageNum() { return pageNum; @@ -76,4 +78,12 @@ public class MdmQuery { public void setMdmCode(Long mdmCode) { this.mdmCode = mdmCode; } + + public List getFields() { + return fields; + } + + public void setFields(List fields) { + this.fields = fields; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java index c13defa1..9a3aca15 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java @@ -50,10 +50,19 @@ public interface IMdmModuleDao extends IBaseDao { JSONObject queryMdmST(Map maps); - List queryMdmSTDetail(Map maps); + List queryMdmSTDetail(Map maps); List queryMdmSTs(Map map); void updateMdmSTs(Map updateMap); + /**** + * 查询主数据字段 + * @content: + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2024-06-27 16:26 + * @param + * @return java.util.List + **/ + List queryMdMFields(Map maps); } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java index 04704d16..8ad07591 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java @@ -1,15 +1,15 @@ package com.hzya.frame.mdm.mdmModule.dao.impl; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.mdm.entity.MdmDataDto; import com.hzya.frame.mdm.entity.MdmDto; import com.hzya.frame.mdm.entity.MdmQuery; -import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; import com.hzya.frame.sys.entity.FormmainDeleteDto; import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; import java.util.HashMap; import java.util.List; @@ -114,6 +114,10 @@ public class MdmModuleDaoImpl extends MybatisGenericDao @Override public List> queryMdmShowData(MdmQuery entity) { + HashMap maps = new HashMap<>(); + maps.put("tableName",entity.getTableName()); + List fields = queryMdMFields(maps); + entity.setFields(fields); List> o = (List>) super.selectList(getSqlIdPrifx() + "queryMdmShowData", entity); return o; } @@ -151,6 +155,9 @@ public class MdmModuleDaoImpl extends MybatisGenericDao @Override public JSONObject queryMdmST(Map maps) { + + List fields = queryMdMFields(maps); + maps.put("fields",fields); JSONObject o = (JSONObject) super.selectOne(getSqlIdPrifx() + "queryMdmST", maps); return o; } @@ -166,7 +173,15 @@ public class MdmModuleDaoImpl extends MybatisGenericDao } @Override - public List queryMdmSTDetail(Map maps) { + public List queryMdMFields(Map maps) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryMdMFields", maps); + return o; + } + + @Override + public List queryMdmSTDetail(Map maps) { + List fields = queryMdMFields(maps); + maps.put("fields", fields ); List o = (List) super.selectList(getSqlIdPrifx() + "queryMdmSTDetail", maps); return o; } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index 4e66bbe3..6a40fb44 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -20,22 +20,25 @@ + + + id - ,mdm_name - ,mdm_logo - ,mdm_code - ,mdm_type - ,remark - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - ,company_id + ,mdm_name + ,mdm_logo + ,mdm_code + ,mdm_type + ,remark + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + - + select + + ${field} + + from ${tableName} and document_rule = #{documentRule} and data_status = #{dataStatus} @@ -875,7 +893,12 @@ where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java index 650142bc..28451124 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java @@ -1700,7 +1700,7 @@ public class MdmServiceImpl implements IMdmService { for (int i = 0; i < mdmModuleDbEntities.size(); i++) { if ("2".equals(mdmModuleDbEntities.get(i).getDbType())) { - Map map = new HashMap<>(); + Map map = new HashMap<>(); map.put("tableName", mdmModuleDbEntities.get(i).getDbName()); map.put("formmainId", object.getString("id")); List detail = mdmModuleDao.queryMdmSTDetail(map); @@ -2639,5 +2639,15 @@ public class MdmServiceImpl implements IMdmService { } return flag; } - + /*** + * 查询所有的字段根据表名称 + * @content: + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2024-06-27 16:29 + * @param + * @return java.util.List + **/ + private List queryMdMFields(Map maps){ + return mdmModuleDao.queryMdMFields(maps); + } }