索引、继承关系

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl

@@ -231,12 +231,12 @@ ${deaction.getRender().code}
         </#if>
         <#comment>附加数据逻辑-操作前</#comment>
         <@addBoforeLogic deaction/>
-        if(!this.retBool(this.baseMapper.insert(et)))
-            return false;
-        <#comment>同步创建继承主实体数据</#comment>
-        <#if isIndexSubDE && indexPSDER.getDERType()=="DERINHERIT">
+        <#comment>同步创建索引主实体、继承主实体数据：继承子实体属性来源与父，先保存父，再保存子，最后get一次获取父数据返回</#comment>
+        <#if isIndexSubDE>
         createIndexMajorEntityData(et);
         </#if>
+        if(!this.retBool(this.baseMapper.insert(et)))
+            return false;
 		<#comment>1：N关系中，在父实体中创建子实体的List集合</#comment>
 		<#if de.getMajorPSDERs?? && de.getMajorPSDERs()??>
 			<#list de.getMajorPSDERs() as MajorPSDER>
@@ -263,10 +263,6 @@ ${deaction.getRender().code}
 		</#if>
         <#comment>成功后get填充一次完整信息</#comment>
         CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()),et);
-        <#comment>同步创建索引主实体数据</#comment>
-        <#if isIndexSubDE && indexPSDER.getDERType()=="DERINDEX">
-        createIndexMajorEntityData(et);
-        </#if>
         <#comment>附加数据逻辑-操作后</#comment>
         <@addAfterLogic deaction/>
         return true;
@@ -294,13 +290,13 @@ ${deaction.getRender().code}
         </#if>
         <#comment>附加数据逻辑-操作前</#comment>
         <@addBoforeLogic deaction/>
+        <#comment>同步更新索引主实体、继承主实体数据：继承子实体属性来源与父，先保存父，再保存子，最后get一次获取父数据返回</#comment>
+        <#if isIndexSubDE>
+        ${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service.update(${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et));
+        </#if>
         <#if de.getKeyPSDEField()??>
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("${keyfield.name?lower_case}",et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}())))
             return false;
-        <#comment>同步更新继承主实体数据</#comment>
-        <#if isIndexSubDE && indexPSDER.getDERType()=="DERINHERIT">
-        ${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service.update(${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et));
-        </#if>
 		<#comment>1：N关系中，在父实体中创建子实体的List集合</#comment>
 		<#if de.getMajorPSDERs?? && de.getMajorPSDERs()??>
 			<#list de.getMajorPSDERs() as MajorPSDER>
@@ -327,10 +323,6 @@ ${deaction.getRender().code}
 		</#if>
         <#comment>成功后get填充一次完整信息</#comment>
         CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()),et);
-        <#comment>同步更新索引主实体数据</#comment>
-        <#if isIndexSubDE && indexPSDER.getDERType()=="DERINDEX">
-        ${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service.update(${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et));
-        </#if>
         <#comment>附加数据逻辑-操作后</#comment>
         <@addAfterLogic deaction/>
         return true;