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

主数据修改

This commit is contained in:
lvleigang 2024-07-24 11:06:16 +08:00
parent 256e616fe5
commit 9035801444
2 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
View File

@ -262,6 +262,7 @@ where id = #{id}
<if test="!detailFlag"> <if test="!detailFlag">
and id = #{id} and id = #{id}
</if> </if>
and data_status != 'N'
and sts = 'Y' and sts = 'Y'
</trim> </trim>
</select> </select>
@ -279,6 +280,7 @@ where id = #{id}
and id = #{id} and id = #{id}
</if> </if>
and sts = 'Y' and sts = 'Y'
and data_status != 'N'
</trim> </trim>
order by sorts asc order by sorts asc
</select> </select>

9
service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
View File

@ -1060,10 +1060,10 @@ public class MdmServiceImpl implements IMdmService {
//1、主表 2、明细 //1、主表 2、明细
mainMdmModuleDb = mdmModuleDbEntityList.get(i); mainMdmModuleDb = mdmModuleDbEntityList.get(i);
//循环字段表 //循环字段表
for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
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())) {
for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) { if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
mainMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1)); mainMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>(); List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>();
@ -1078,19 +1078,23 @@ public class MdmServiceImpl implements IMdmService {
} }
mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules); mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
} }
} }
} }
} }
} }
} else if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) { } else if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) {
//2、明细 //2、明细
sublistMdmModuleDb.add(mdmModuleDbEntityList.get(i)); sublistMdmModuleDb.add(mdmModuleDbEntityList.get(i));
//循环字段表 //循环字段表
if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
List<MdmModuleDbFiledsEntity> sublistMdmModuleDbFileds = new ArrayList<>(); List<MdmModuleDbFiledsEntity> sublistMdmModuleDbFileds = new ArrayList<>();
for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
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())) {
for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) { if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
sublistMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1)); sublistMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>(); List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>();
@ -1106,7 +1110,6 @@ public class MdmServiceImpl implements IMdmService {
mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules); mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
} }
} }
} }
} }
mdmModuleDbEntityList.get(i).setSublistMdmModuleDbFileds(sublistMdmModuleDbFileds); mdmModuleDbEntityList.get(i).setSublistMdmModuleDbFileds(sublistMdmModuleDbFileds);