hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改主数据显示

This commit is contained in:
lvleigang 2024-08-09 10:28:20 +08:00
parent f5a9fe7077
commit 9e619c8425
1 changed files with 114 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

212
service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
View File

@ -173,7 +173,6 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
//删除单据规则 //删除单据规则
MdmTableCodeRuleEntity mdmTableCodeRuleEntity = new MdmTableCodeRuleEntity(); MdmTableCodeRuleEntity mdmTableCodeRuleEntity = new MdmTableCodeRuleEntity();
mdmTableCodeRuleEntity.setUpdate(); mdmTableCodeRuleEntity.setUpdate();
@ -313,7 +312,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
entity.setCreate(); entity.setCreate();
mdmModuleDao.save(entity); mdmModuleDao.save(entity);
entity = mdmModuleDao.get(entity.getId()); entity = mdmModuleDao.get(entity.getId());
return BaseResult.getSuccessMessageEntity("保存成功",entity); return BaseResult.getSuccessMessageEntity("保存成功", entity);
} }
/** /**
@ -479,7 +478,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
mdmModuleDbEntity.setMdmId(entity.getMdmId()); mdmModuleDbEntity.setMdmId(entity.getMdmId());
mdmModuleDbEntity.setDbName(entity.getDbName() + "_option_log"); mdmModuleDbEntity.setDbName(entity.getDbName() + "_option_log");
mdmModuleDbEntity.setDbType("3"); mdmModuleDbEntity.setDbType("3");
mdmModuleDbEntity.setRemark(entity.getRemark()+"操作日志"); mdmModuleDbEntity.setRemark(entity.getRemark() + "操作日志");
mdmModuleDbEntity.setCreate(); mdmModuleDbEntity.setCreate();
mdmModuleDbEntity.setDataType("1"); mdmModuleDbEntity.setDataType("1");
mdmModuleDbEntities.add(mdmModuleDbEntity); mdmModuleDbEntities.add(mdmModuleDbEntity);
@ -490,7 +489,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
mdmModuleDbEntity1.setMdmId(entity.getMdmId()); mdmModuleDbEntity1.setMdmId(entity.getMdmId());
mdmModuleDbEntity1.setDbName(entity.getDbName() + "_send_log"); mdmModuleDbEntity1.setDbName(entity.getDbName() + "_send_log");
mdmModuleDbEntity1.setDbType("4"); mdmModuleDbEntity1.setDbType("4");
mdmModuleDbEntity1.setRemark(entity.getRemark()+"下发日志"); mdmModuleDbEntity1.setRemark(entity.getRemark() + "下发日志");
mdmModuleDbEntity1.setCreate(); mdmModuleDbEntity1.setCreate();
mdmModuleDbEntity1.setDataType("1"); mdmModuleDbEntity1.setDataType("1");
mdmModuleDbEntities.add(mdmModuleDbEntity1); mdmModuleDbEntities.add(mdmModuleDbEntity1);
@ -503,7 +502,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
mdmModuleDbEntity.setDbName(mdmModuleDbEntities.get(i).getDbName()); mdmModuleDbEntity.setDbName(mdmModuleDbEntities.get(i).getDbName());
mdmModuleDbEntity.setSts("Y"); mdmModuleDbEntity.setSts("Y");
int a = mdmModuleDbDao.getCount(mdmModuleDbEntity); int a = mdmModuleDbDao.getCount(mdmModuleDbEntity);
if(a > 0){ if (a > 0) {
return BaseResult.getFailureMessageEntity("表已存在，请修改"); return BaseResult.getFailureMessageEntity("表已存在，请修改");
} }
} }
@ -1324,6 +1323,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
return BaseResult.getSuccessMessageEntity("获取数据源表字段成功", dbEntities); return BaseResult.getSuccessMessageEntity("获取数据源表字段成功", dbEntities);
} }
/** /**
* @param object * @param object
* @return com.hzya.frame.web.entity.JsonResultEntity * @return com.hzya.frame.web.entity.JsonResultEntity
@ -1364,6 +1364,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
return BaseResult.getSuccessMessageEntity("获取数据源表字段成功", entity); return BaseResult.getSuccessMessageEntity("获取数据源表字段成功", entity);
} }
/** /**
* @param object * @param object
* @return com.hzya.frame.web.entity.JsonResultEntity * @return com.hzya.frame.web.entity.JsonResultEntity
@ -1403,22 +1404,22 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId()); mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
mdmModuleDbFiledsEntity.setSts("Y"); mdmModuleDbFiledsEntity.setSts("Y");
List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
if(mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0){ if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
for (int i = 0; i < mdmModuleDbFiledsEntityList.size(); i++) { for (int i = 0; i < mdmModuleDbFiledsEntityList.size(); i++) {
if(entity.getDbId().equals(mdmModuleDbFiledsEntityList.get(i).getDbId()) && entity.getEnName().equals(mdmModuleDbFiledsEntityList.get(i).getEnName())){ if (entity.getDbId().equals(mdmModuleDbFiledsEntityList.get(i).getDbId()) && entity.getEnName().equals(mdmModuleDbFiledsEntityList.get(i).getEnName())) {
return BaseResult.getFailureMessageEntity("字段已存在，请修改"); return BaseResult.getFailureMessageEntity("字段已存在，请修改");
} }
} }
} }
entity.setCreate(); entity.setCreate();
if("1".equals(entity.getDbType())){ if ("1".equals(entity.getDbType())) {
entity.setAddType("1"); entity.setAddType("1");
entity.setUpdateType("1"); entity.setUpdateType("1");
entity.setShowType("1"); entity.setShowType("1");
entity.setQueryType("1"); entity.setQueryType("1");
entity.setListType("1"); entity.setListType("1");
entity.setViewType("1"); entity.setViewType("1");
}else { } else {
entity.setAddType("1"); entity.setAddType("1");
entity.setUpdateType("1"); entity.setUpdateType("1");
entity.setShowType("1"); entity.setShowType("1");
@ -1484,7 +1485,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
entity.setDataType("2"); entity.setDataType("2");
try { try {
mdmModuleDao.alterTableField(entity); mdmModuleDao.alterTableField(entity);
} catch (Exception e){ } catch (Exception e) {
throw new BaseSystemException("表字段类型，修改失败，请联系管理员"); throw new BaseSystemException("表字段类型，修改失败，请联系管理员");
} }
List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>(); List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
@ -1678,9 +1679,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
List<MdmModuleViewEntity> moduleViewEntities = mdmModuleViewDao.queryBase(entity); List<MdmModuleViewEntity> moduleViewEntities = mdmModuleViewDao.queryBase(entity);
if(moduleViewEntities == null || moduleViewEntities.size() == 0){ if (moduleViewEntities == null || moduleViewEntities.size() == 0) {
return BaseResult.getSuccessMessageEntity("获取显示类型成功"); return BaseResult.getSuccessMessageEntity("获取显示类型成功");
}else if (moduleViewEntities != null && moduleViewEntities.size() > 1) { } else if (moduleViewEntities != null && moduleViewEntities.size() > 1) {
return BaseResult.getFailureMessageEntity("获取显示类型失败"); return BaseResult.getFailureMessageEntity("获取显示类型失败");
} else { } else {
return BaseResult.getSuccessMessageEntity("获取显示类型成功", moduleViewEntities.get(0)); return BaseResult.getSuccessMessageEntity("获取显示类型成功", moduleViewEntities.get(0));
@ -1707,10 +1708,10 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
SysMenuConfigEntity module = new SysMenuConfigEntity(); SysMenuConfigEntity module = new SysMenuConfigEntity();
module.setCreate(); module.setCreate();
module.setFormId(mdmModuleEntity.getId()); module.setFormId(mdmModuleEntity.getId());
if("1".equals(mdmModuleEntity.getMdmType())){ if ("1".equals(mdmModuleEntity.getMdmType())) {
//1、档案 //1、档案
module.setParentMenuId("ea22757e99c144fb9ef381dd322e233c"); module.setParentMenuId("ea22757e99c144fb9ef381dd322e233c");
}else { } else {
//2、单据 //2、单据
module.setParentMenuId("58714ddb7ec94f5da91df74efada042f"); module.setParentMenuId("58714ddb7ec94f5da91df74efada042f");
} }
@ -1746,7 +1747,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(mdmModuleViewButtonEntity); List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(mdmModuleViewButtonEntity);
//删除处理权限 //删除处理权限
doMdmModuleButton(module,mdmModuleViewButtonEntities,sysButtonConfigEntities,sysPopedomOperateEntities); doMdmModuleButton(module, mdmModuleViewButtonEntities, sysButtonConfigEntities, sysPopedomOperateEntities);
return BaseResult.getSuccessMessageEntity("保存显示类型成功"); return BaseResult.getSuccessMessageEntity("保存显示类型成功");
} }
@ -1775,14 +1776,14 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
module.setFormId(mdmModuleEntity.getId()); module.setFormId(mdmModuleEntity.getId());
List<SysMenuConfigEntity> sysMenuConfigEntities = sysMenuConfigDao.queryBase(module); List<SysMenuConfigEntity> sysMenuConfigEntities = sysMenuConfigDao.queryBase(module);
if(sysMenuConfigEntities != null && sysMenuConfigEntities.size() == 1){ if (sysMenuConfigEntities != null && sysMenuConfigEntities.size() == 1) {
module = sysMenuConfigEntities.get(0); module = sysMenuConfigEntities.get(0);
module.setUpdate(); module.setUpdate();
module.setFormId(mdmModuleEntity.getId()); module.setFormId(mdmModuleEntity.getId());
if("1".equals(mdmModuleEntity.getMdmType())){ if ("1".equals(mdmModuleEntity.getMdmType())) {
//1、档案 //1、档案
module.setParentMenuId("ea22757e99c144fb9ef381dd322e233c"); module.setParentMenuId("ea22757e99c144fb9ef381dd322e233c");
}else { } else {
//2、单据 //2、单据
module.setParentMenuId("58714ddb7ec94f5da91df74efada042f"); module.setParentMenuId("58714ddb7ec94f5da91df74efada042f");
} }
@ -1818,7 +1819,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(mdmModuleViewButtonEntity); List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(mdmModuleViewButtonEntity);
//删除处理权限 //删除处理权限
doMdmModuleButton(module,mdmModuleViewButtonEntities,sysButtonConfigEntities,sysPopedomOperateEntities); doMdmModuleButton(module, mdmModuleViewButtonEntities, sysButtonConfigEntities, sysPopedomOperateEntities);
} }
return BaseResult.getSuccessMessageEntity("修改显示类型成功"); return BaseResult.getSuccessMessageEntity("修改显示类型成功");
} }
@ -1885,9 +1886,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
switch (mdmModuleViewDetailEntityList.get(i).getViewType()) { switch (mdmModuleViewDetailEntityList.get(i).getViewType()) {
//1、查询2、列表3、新增4、修改 5、查看 //1、查询2、列表3、新增4、修改 5、查看
case "1": case "1":
if(mdmModuleViewVo.getQueryFiled() != null && mdmModuleViewVo.getQueryFiled().size() > 0 ){ if (mdmModuleViewVo.getQueryFiled() != null && mdmModuleViewVo.getQueryFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getQueryFiled().size(); i1++) { for (int i1 = 0; i1 < mdmModuleViewVo.getQueryFiled().size(); i1++) {
if(mdmModuleViewVo.getQueryFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){ if (mdmModuleViewVo.getQueryFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getQueryFiled().get(i1).getName()); mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getQueryFiled().get(i1).getName());
queryFiled.add(mdmModuleViewDetailEntityList.get(i)); queryFiled.add(mdmModuleViewDetailEntityList.get(i));
} }
@ -1895,9 +1896,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
break; break;
case "2": case "2":
if(mdmModuleViewVo.getListFiled() != null && mdmModuleViewVo.getListFiled().size() > 0 ){ if (mdmModuleViewVo.getListFiled() != null && mdmModuleViewVo.getListFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getListFiled().size(); i1++) { for (int i1 = 0; i1 < mdmModuleViewVo.getListFiled().size(); i1++) {
if(mdmModuleViewVo.getListFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){ if (mdmModuleViewVo.getListFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getListFiled().get(i1).getName()); mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getListFiled().get(i1).getName());
listFiled.add(mdmModuleViewDetailEntityList.get(i)); listFiled.add(mdmModuleViewDetailEntityList.get(i));
} }
@ -1905,9 +1906,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
break; break;
case "3": case "3":
if(mdmModuleViewVo.getAddFiled() != null && mdmModuleViewVo.getAddFiled().size() > 0 ){ if (mdmModuleViewVo.getAddFiled() != null && mdmModuleViewVo.getAddFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getAddFiled().size(); i1++) { for (int i1 = 0; i1 < mdmModuleViewVo.getAddFiled().size(); i1++) {
if(mdmModuleViewVo.getAddFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){ if (mdmModuleViewVo.getAddFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getAddFiled().get(i1).getName()); mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getAddFiled().get(i1).getName());
addFiled.add(mdmModuleViewDetailEntityList.get(i)); addFiled.add(mdmModuleViewDetailEntityList.get(i));
} }
@ -1915,9 +1916,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
break; break;
case "4": case "4":
if(mdmModuleViewVo.getEditFiled() != null && mdmModuleViewVo.getEditFiled().size() > 0 ){ if (mdmModuleViewVo.getEditFiled() != null && mdmModuleViewVo.getEditFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getEditFiled().size(); i1++) { for (int i1 = 0; i1 < mdmModuleViewVo.getEditFiled().size(); i1++) {
if(mdmModuleViewVo.getEditFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){ if (mdmModuleViewVo.getEditFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getEditFiled().get(i1).getName()); mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getEditFiled().get(i1).getName());
editFiled.add(mdmModuleViewDetailEntityList.get(i)); editFiled.add(mdmModuleViewDetailEntityList.get(i));
} }
@ -1925,9 +1926,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
break; break;
case "5": case "5":
if(mdmModuleViewVo.getShowFiled() != null && mdmModuleViewVo.getShowFiled().size() > 0 ){ if (mdmModuleViewVo.getShowFiled() != null && mdmModuleViewVo.getShowFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getShowFiled().size(); i1++) { for (int i1 = 0; i1 < mdmModuleViewVo.getShowFiled().size(); i1++) {
if(mdmModuleViewVo.getShowFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){ if (mdmModuleViewVo.getShowFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getShowFiled().get(i1).getName()); mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getShowFiled().get(i1).getName());
showFiled.add(mdmModuleViewDetailEntityList.get(i)); showFiled.add(mdmModuleViewDetailEntityList.get(i));
} }
@ -1967,45 +1968,45 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
List<MdmDbFiledVo> listFiled = new ArrayList<>(); List<MdmDbFiledVo> listFiled = new ArrayList<>();
if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) { if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
if("3".equals(mdmModuleDbEntityList.get(i).getDbType()) || "4".equals(mdmModuleDbEntityList.get(i).getDbType())){ if ("3".equals(mdmModuleDbEntityList.get(i).getDbType()) || "4".equals(mdmModuleDbEntityList.get(i).getDbType())) {
continue; continue;
} }
if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) { if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
if("document_rule".equals(mdmModuleDbFiledsEntityList.get(i1).getEnName())){ if ("document_rule".equals(mdmModuleDbFiledsEntityList.get(i1).getEnName())) {
continue; continue;
} }
if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
//1、主表 //1、主表
if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())){ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())) {
addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
} }
if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())){ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())) {
editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
} }
if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())){ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())) {
showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
} }
if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())){ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())) {
queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
} }
if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getListType())){ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getListType())) {
listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
} }
} else { } else {
//2、明细 //2、明细
if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())){ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())) {
queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
} }
if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())){ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())) {
addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
} }
if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())){ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())) {
editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
} }
if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())){ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())) {
showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
} }
} }
@ -2177,7 +2178,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
SysMenuConfigEntity module = new SysMenuConfigEntity(); SysMenuConfigEntity module = new SysMenuConfigEntity();
module.setFormId(mdmModuleEntity.getId()); module.setFormId(mdmModuleEntity.getId());
List<SysMenuConfigEntity> sysMenuConfigEntities = sysMenuConfigDao.queryBase(module); List<SysMenuConfigEntity> sysMenuConfigEntities = sysMenuConfigDao.queryBase(module);
if(sysMenuConfigEntities != null && sysMenuConfigEntities.size() == 1){ if (sysMenuConfigEntities != null && sysMenuConfigEntities.size() == 1) {
module = sysMenuConfigEntities.get(0); module = sysMenuConfigEntities.get(0);
SysButtonConfigEntity buttonConfigEntity = new SysButtonConfigEntity(); SysButtonConfigEntity buttonConfigEntity = new SysButtonConfigEntity();
buttonConfigEntity.setMenuId(module.getId()); buttonConfigEntity.setMenuId(module.getId());
@ -2192,36 +2193,37 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
sysButtonConfigDao.logicRemoveMultiCondition(buttonConfigEntity); sysButtonConfigDao.logicRemoveMultiCondition(buttonConfigEntity);
sysPopedomOperateDao.logicRemoveMultiCondition(sysPopedomOperateEntity); sysPopedomOperateDao.logicRemoveMultiCondition(sysPopedomOperateEntity);
//删除处理权限 //删除处理权限
doMdmModuleButton(module,entity.getDbButtonFiled(),sysButtonConfigEntities,sysPopedomOperateEntities); doMdmModuleButton(module, entity.getDbButtonFiled(), sysButtonConfigEntities, sysPopedomOperateEntities);
} }
return BaseResult.getSuccessMessageEntity("修改显示按钮成功"); return BaseResult.getSuccessMessageEntity("修改显示按钮成功");
} }
/** /**
* @param module 菜单
* @param mdmModuleViewButtonEntities 主数据按钮
* @param sysButtonConfigEntities 菜单按钮
* @param sysPopedomOperateEntities 按钮权限
* @return void
* @Author lvleigang * @Author lvleigang
* @Description * @Description
* @Date 3:29 下午 2024/6/4 * @Date 3:29 下午 2024/6/4
* @param module 菜单
* @param mdmModuleViewButtonEntities 主数据按钮
* @param sysButtonConfigEntities 菜单按钮
* @param sysPopedomOperateEntities 按钮权限
* @return void
**/ **/
private void doMdmModuleButton(SysMenuConfigEntity module,List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities, List<SysButtonConfigEntity> sysButtonConfigEntities, List<SysPopedomOperateEntity> sysPopedomOperateEntities) { private void doMdmModuleButton(SysMenuConfigEntity module, List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities, List<SysButtonConfigEntity> sysButtonConfigEntities, List<SysPopedomOperateEntity> sysPopedomOperateEntities) {
//循环设置的按钮，再循环菜单的按钮，如果有把原先的修改状态，如果没有新增 //循环设置的按钮，再循环菜单的按钮，如果有把原先的修改状态，如果没有新增
if(mdmModuleViewButtonEntities != null && mdmModuleViewButtonEntities.size() > 0){ if (mdmModuleViewButtonEntities != null && mdmModuleViewButtonEntities.size() > 0) {
for (int i = 0; i < mdmModuleViewButtonEntities.size(); i++) { for (int i = 0; i < mdmModuleViewButtonEntities.size(); i++) {
boolean flag = false; boolean flag = false;
if(sysButtonConfigEntities != null && sysButtonConfigEntities.size() > 0){ if (sysButtonConfigEntities != null && sysButtonConfigEntities.size() > 0) {
for (int i1 = 0; i1 < sysButtonConfigEntities.size(); i1++) { for (int i1 = 0; i1 < sysButtonConfigEntities.size(); i1++) {
if(mdmModuleViewButtonEntities.get(i).getButtonValue().equals(sysButtonConfigEntities.get(i1).getCode())){ if (mdmModuleViewButtonEntities.get(i).getButtonValue().equals(sysButtonConfigEntities.get(i1).getCode())) {
flag = true; flag = true;
sysButtonConfigEntities.get(i1).setSts("Y"); sysButtonConfigEntities.get(i1).setSts("Y");
sysButtonConfigEntities.get(i1).setUpdate(); sysButtonConfigEntities.get(i1).setUpdate();
sysButtonConfigEntities.get(i1).setSorts(i+1L); sysButtonConfigEntities.get(i1).setSorts(i + 1L);
sysButtonConfigDao.update(sysButtonConfigEntities.get(i1)); sysButtonConfigDao.update(sysButtonConfigEntities.get(i1));
if(sysPopedomOperateEntities != null && sysPopedomOperateEntities.size() > 0){ if (sysPopedomOperateEntities != null && sysPopedomOperateEntities.size() > 0) {
for (int i2 = 0; i2 < sysPopedomOperateEntities.size(); i2++) { for (int i2 = 0; i2 < sysPopedomOperateEntities.size(); i2++) {
if(sysPopedomOperateEntities.get(i2).getOperate().equals(sysButtonConfigEntities.get(i1).getId())){ if (sysPopedomOperateEntities.get(i2).getOperate().equals(sysButtonConfigEntities.get(i1).getId())) {
sysPopedomOperateEntities.get(i2).setSts("Y"); sysPopedomOperateEntities.get(i2).setSts("Y");
sysPopedomOperateEntities.get(i2).setUpdate(); sysPopedomOperateEntities.get(i2).setUpdate();
sysPopedomOperateDao.update(sysPopedomOperateEntities.get(i2)); sysPopedomOperateDao.update(sysPopedomOperateEntities.get(i2));
@ -2233,8 +2235,8 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
} }
//原先没有需要新增 //原先没有需要新增
if(!flag){ if (!flag) {
if("new".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){ if ("new".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity xz = new SysButtonConfigEntity(); SysButtonConfigEntity xz = new SysButtonConfigEntity();
xz.setCode("new"); xz.setCode("new");
xz.setNameCh("新建"); xz.setNameCh("新建");
@ -2244,11 +2246,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
xz.setStyles(""); xz.setStyles("");
xz.setBtnFunction("new"); xz.setBtnFunction("new");
xz.setRemark("主数据新建按钮"); xz.setRemark("主数据新建按钮");
xz.setSorts(i+1L); xz.setSorts(i + 1L);
xz.setCreate(); xz.setCreate();
sysButtonConfigDao.save(xz); sysButtonConfigDao.save(xz);
} }
if("resize".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){ if ("resize".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity cz = new SysButtonConfigEntity(); SysButtonConfigEntity cz = new SysButtonConfigEntity();
cz.setCode("resize"); cz.setCode("resize");
@ -2259,12 +2261,12 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
cz.setStyles(""); cz.setStyles("");
cz.setBtnFunction("resize"); cz.setBtnFunction("resize");
cz.setRemark("主数据重置按钮"); cz.setRemark("主数据重置按钮");
cz.setSorts(i+1L); cz.setSorts(i + 1L);
cz.setCreate(); cz.setCreate();
sysButtonConfigDao.save(cz); sysButtonConfigDao.save(cz);
} }
if("search".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { if ("search".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity cx = new SysButtonConfigEntity(); SysButtonConfigEntity cx = new SysButtonConfigEntity();
cx.setCode("search"); cx.setCode("search");
@ -2275,11 +2277,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
cx.setStyles(""); cx.setStyles("");
cx.setBtnFunction("search"); cx.setBtnFunction("search");
cx.setRemark("主数据查询按钮"); cx.setRemark("主数据查询按钮");
cx.setSorts(i+1L); cx.setSorts(i + 1L);
cx.setCreate(); cx.setCreate();
sysButtonConfigDao.save(cx); sysButtonConfigDao.save(cx);
} }
if("edit".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { if ("edit".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity xg = new SysButtonConfigEntity(); SysButtonConfigEntity xg = new SysButtonConfigEntity();
xg.setCode("edit"); xg.setCode("edit");
@ -2290,11 +2292,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
xg.setStyles(""); xg.setStyles("");
xg.setBtnFunction("edit"); xg.setBtnFunction("edit");
xg.setRemark("主数据修改按钮"); xg.setRemark("主数据修改按钮");
xg.setSorts(i+1L); xg.setSorts(i + 1L);
xg.setCreate(); xg.setCreate();
sysButtonConfigDao.save(xg); sysButtonConfigDao.save(xg);
} }
if("dele".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { if ("dele".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity sc = new SysButtonConfigEntity(); SysButtonConfigEntity sc = new SysButtonConfigEntity();
sc.setCode("dele"); sc.setCode("dele");
@ -2305,11 +2307,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
sc.setStyles(""); sc.setStyles("");
sc.setBtnFunction("dele"); sc.setBtnFunction("dele");
sc.setRemark("主数据删除按钮"); sc.setRemark("主数据删除按钮");
sc.setSorts(i+1L); sc.setSorts(i + 1L);
sc.setCreate(); sc.setCreate();
sysButtonConfigDao.save(sc); sysButtonConfigDao.save(sc);
} }
if("view".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { if ("view".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity ck = new SysButtonConfigEntity(); SysButtonConfigEntity ck = new SysButtonConfigEntity();
ck.setCode("view"); ck.setCode("view");
@ -2320,11 +2322,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
ck.setStyles(""); ck.setStyles("");
ck.setBtnFunction("view"); ck.setBtnFunction("view");
ck.setRemark("主数据查看按钮"); ck.setRemark("主数据查看按钮");
ck.setSorts(i+1L); ck.setSorts(i + 1L);
ck.setCreate(); ck.setCreate();
sysButtonConfigDao.save(ck); sysButtonConfigDao.save(ck);
} }
if("send".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { if ("send".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity xf = new SysButtonConfigEntity(); SysButtonConfigEntity xf = new SysButtonConfigEntity();
xf.setCode("send"); xf.setCode("send");
xf.setNameCh("下发"); xf.setNameCh("下发");
@ -2334,7 +2336,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
xf.setStyles(""); xf.setStyles("");
xf.setBtnFunction("send"); xf.setBtnFunction("send");
xf.setRemark("主数据下发按钮"); xf.setRemark("主数据下发按钮");
xf.setSorts(i+1L); xf.setSorts(i + 1L);
xf.setCreate(); xf.setCreate();
sysButtonConfigDao.save(xf); sysButtonConfigDao.save(xf);
} }
@ -2344,6 +2346,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
} }
} }
/** /**
* @param object * @param object
* @return com.hzya.frame.web.entity.JsonResultEntity * @return com.hzya.frame.web.entity.JsonResultEntity
@ -2464,17 +2467,17 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
return BaseResult.getFailureMessageEntity("系统错误"); return BaseResult.getFailureMessageEntity("系统错误");
} }
List<MdmModuleDistributeEntity> list = mdmModuleDistributeDao.queryBase(entity); List<MdmModuleDistributeEntity> list = mdmModuleDistributeDao.queryBase(entity);
if(list != null && list.size() > 0){ if (list != null && list.size() > 0) {
MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = new MdmModuleDistributeDetailEntity(); MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = new MdmModuleDistributeDetailEntity();
mdmModuleDistributeDetailEntity.setMdmId(entity.getMdmId()); mdmModuleDistributeDetailEntity.setMdmId(entity.getMdmId());
mdmModuleDistributeDetailEntity.setSts("Y"); mdmModuleDistributeDetailEntity.setSts("Y");
List<MdmModuleDistributeDetailEntity> listDetail = mdmModuleDistributeDetailDao.queryBase(mdmModuleDistributeDetailEntity); List<MdmModuleDistributeDetailEntity> listDetail = mdmModuleDistributeDetailDao.queryBase(mdmModuleDistributeDetailEntity);
if(listDetail != null && listDetail.size() > 0){ if (listDetail != null && listDetail.size() > 0) {
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
List<MdmModuleDistributeDetailEntity> mdmModuleDistributeDetailEntities = new ArrayList<>(); List<MdmModuleDistributeDetailEntity> mdmModuleDistributeDetailEntities = new ArrayList<>();
for (int i1 = 0; i1 < listDetail.size(); i1++) { for (int i1 = 0; i1 < listDetail.size(); i1++) {
if(listDetail.get(i1).getDistributeId().equals(list.get(i).getId())){ if (listDetail.get(i1).getDistributeId().equals(list.get(i).getId())) {
mdmModuleDistributeDetailEntities.add(listDetail.get(i1) ); mdmModuleDistributeDetailEntities.add(listDetail.get(i1));
} }
} }
list.get(i).setMdmModuleDistributeDetailEntities(mdmModuleDistributeDetailEntities); list.get(i).setMdmModuleDistributeDetailEntities(mdmModuleDistributeDetailEntities);
@ -2623,21 +2626,21 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
return BaseResult.getFailureMessageEntity("系统错误"); return BaseResult.getFailureMessageEntity("系统错误");
} }
MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ if (mdmModuleEntity == null || mdmModuleEntity.getId() == null) {
return BaseResult.getFailureMessageEntity("系统错误"); return BaseResult.getFailureMessageEntity("系统错误");
} }
MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
mdmModuleDbEntity.setSts("Y"); mdmModuleDbEntity.setSts("Y");
List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0) {
for (int i = 0; i < mdmModuleDbEntities.size(); i++) { for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ if ("1".equals(mdmModuleDbEntities.get(i).getDbType())) {
entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_option_log"); entity.setTableName(mdmModuleDbEntities.get(i).getDbName() + "_option_log");
break; break;
} }
} }
}else { } else {
return BaseResult.getFailureMessageEntity("请先设置数据源"); return BaseResult.getFailureMessageEntity("请先设置数据源");
} }
PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
@ -2683,16 +2686,29 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
List<MdmModuleSendLogEntity> list = mdmModuleSendLogDao.queryByLike(entity); List<MdmModuleSendLogEntity> list = mdmModuleSendLogDao.queryByLike(entity);
if (list != null && list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
if (list.get(i).getOptionType() != null) {
if ("1".equals(list.get(i).getOptionType())) {
list.get(i).setOptionType("新增");
} else if ("2".equals(list.get(i).getOptionType())) {
list.get(i).setOptionType("修改");
} else if ("3".equals(list.get(i).getOptionType())) {
list.get(i).setOptionType("删除");
}
}
}
}
PageInfo pageInfo = new PageInfo(list); PageInfo pageInfo = new PageInfo(list);
return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
} }
/** /**
* @Author lvleigang
* @Description 主数据-数据源-服务获取（只获取主表）
* @Date 11:43 上午 2024/6/11
* @param object * @param object
* @return com.hzya.frame.web.entity.JsonResultEntity * @return com.hzya.frame.web.entity.JsonResultEntity
* @Author lvleigang
* @Description 主数据-数据源-服务获取（只获取主表）
* @Date 11:43 上午 2024/6/11
**/ **/
@Override @Override
public JsonResultEntity queryMdmService(JSONObject object) { public JsonResultEntity queryMdmService(JSONObject object) {
@ -2706,11 +2722,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
/** /**
* @Author lvleigang
* @Description 主数据-数据源-服务字段获取
* @Date 11:43 上午 2024/6/11
* @param object * @param object
* @return com.hzya.frame.web.entity.JsonResultEntity * @return com.hzya.frame.web.entity.JsonResultEntity
* @Author lvleigang
* @Description 主数据-数据源-服务字段获取
* @Date 11:43 上午 2024/6/11
**/ **/
@Override @Override
public JsonResultEntity queryMdmServiceField(JSONObject object) { public JsonResultEntity queryMdmServiceField(JSONObject object) {
@ -2729,9 +2745,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId()); mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
List<MdmModuleDbFiledsEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); List<MdmModuleDbFiledsEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
List<MdmModuleDbFiledsEntity> list = new ArrayList<>(); List<MdmModuleDbFiledsEntity> list = new ArrayList<>();
if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){ if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0) {
for (int i = 0; i < mdmModuleDbEntities.size(); i++) { for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
if(entity.getDbId().equals(mdmModuleDbEntities.get(i).getDbId()) && "1".equals(mdmModuleDbEntities.get(i).getViewType())){ if (entity.getDbId().equals(mdmModuleDbEntities.get(i).getDbId()) && "1".equals(mdmModuleDbEntities.get(i).getViewType())) {
list.add(mdmModuleDbEntities.get(i)); list.add(mdmModuleDbEntities.get(i));
} }
} }
@ -2740,11 +2756,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
/** /**
* @Author lvleigang
* @Description 主数据-分发-只获取主表
* @Date 11:43 上午 2024/6/11
* @param object * @param object
* @return com.hzya.frame.web.entity.JsonResultEntity * @return com.hzya.frame.web.entity.JsonResultEntity
* @Author lvleigang
* @Description 主数据-分发-只获取主表
* @Date 11:43 上午 2024/6/11
**/ **/
@Override @Override
public JsonResultEntity queryMdmMainDB(JSONObject object) { public JsonResultEntity queryMdmMainDB(JSONObject object) {
@ -2760,9 +2776,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
mdmModuleDbEntity.setMdmId(entity.getMdmId()); mdmModuleDbEntity.setMdmId(entity.getMdmId());
List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
List<MdmModuleDbEntity> list = new ArrayList<>(); List<MdmModuleDbEntity> list = new ArrayList<>();
if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){ if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0) {
for (int i = 0; i < mdmModuleDbEntities.size(); i++) { for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ if ("1".equals(mdmModuleDbEntities.get(i).getDbType())) {
list.add(mdmModuleDbEntities.get(i)); list.add(mdmModuleDbEntities.get(i));
} }
} }
@ -2771,11 +2787,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
} }
/** /**
* @Author lvleigang
* @Description 主数据-数据源-只获取主表字段
* @Date 11:43 上午 2024/6/11
* @param object * @param object
* @return com.hzya.frame.web.entity.JsonResultEntity * @return com.hzya.frame.web.entity.JsonResultEntity
* @Author lvleigang
* @Description 主数据-数据源-只获取主表字段
* @Date 11:43 上午 2024/6/11
**/ **/
@Override @Override
public JsonResultEntity queryMdmMainDBField(JSONObject object) { public JsonResultEntity queryMdmMainDBField(JSONObject object) {
@ -2797,12 +2813,12 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
List<MdmModuleDbFiledsEntity> list = new ArrayList<>(); List<MdmModuleDbFiledsEntity> list = new ArrayList<>();
if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){ if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0) {
for (int i = 0; i < mdmModuleDbEntities.size(); i++) { for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ if ("1".equals(mdmModuleDbEntities.get(i).getDbType())) {
if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){ if (mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0) {
for (int i1 = 0; i1 < mdmModuleDbFiledsEntities.size(); i1++) { for (int i1 = 0; i1 < mdmModuleDbFiledsEntities.size(); i1++) {
if(mdmModuleDbEntities.get(i).getId().equals(mdmModuleDbFiledsEntities.get(i1).getDbId()) && "1".equals(mdmModuleDbFiledsEntities.get(i1).getViewType())){ if (mdmModuleDbEntities.get(i).getId().equals(mdmModuleDbFiledsEntities.get(i1).getDbId()) && "1".equals(mdmModuleDbFiledsEntities.get(i1).getViewType())) {
list.add(mdmModuleDbFiledsEntities.get(i1)); list.add(mdmModuleDbFiledsEntities.get(i1));
} }
} }