实体关系属性映射

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

@@ -655,12 +655,12 @@ ${deaction.getRender().code}
         //实体关系[${MinorPSDER.name}]
         if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){
             <#if MinorPSDER.getPSDER1NDEFieldMaps?? && MinorPSDER.getPSDER1NDEFieldMaps()??>
-                ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=new ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()}();
+            ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=new ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()}();
                 <#list MinorPSDER.getPSDER1NDEFieldMaps() as derField>
                     <#if derField.getMapType()=="COUNT" || derField.getMapType()=="SUM"|| derField.getMapType()=="AVG" || derField.getMapType()=="MAX" || derField.getMapType()=="MIN">
                         <#assign MajorEntityDEFieldCodeName=srfcaseformat(derField.getMajorPSDEField().codeName,'l_u2lC')>
                         <#if derField.getMapType()=="COUNT">
-                ${MajorEntityName}.set("${MajorEntityDEFieldCodeName}",baseMapper.selectCount(new QueryWrapper()));
+            ${MajorEntityName}.set("${MajorEntityDEFieldCodeName}",baseMapper.selectCount(new QueryWrapper().eq(true,"${MajorKeyFieldName}",et.get${MajorKeyFieldCodeName}())));
                         <#else>
                             <#assign MinorEntityDEFieldName=derField.getMinorPSDEField().name?lower_case>
                             <#if derField.getMapType()=="SUM">
@@ -673,17 +673,16 @@ ${deaction.getRender().code}
                                 <#assign derFieldType="min("+MinorEntityDEFieldName+")">
                             </#if>
                             <#if derFieldType??>
-                List<Object> objects_${derField_index} = baseMapper.selectObjs(new QueryWrapper().select("${derFieldType}").eq(true,"${MajorKeyFieldName}",et.get${MajorKeyFieldCodeName}()));
-                if(!ObjectUtils.isEmpty(objects_${derField_index}) && objects_${derField_index}.size()>0){
-                    ${MajorEntityName}.set("${MajorEntityDEFieldCodeName}",objects_${derField_index}.get(0));
-                }
-
+            List<Object> objects_${derField_index} = baseMapper.selectObjs(new QueryWrapper().select("${derFieldType}").eq(true,"${MajorKeyFieldName}",et.get${MajorKeyFieldCodeName}()));
+            if(!ObjectUtils.isEmpty(objects_${derField_index}) && objects_${derField_index}.size()>0){
+                ${MajorEntityName}.set("${MajorEntityDEFieldCodeName}",objects_${derField_index}.get(0));
+            }
                             </#if>
                         </#if>
                     </#if>
                 </#list>
-                ${MajorEntityName}.set("${MajorKeyFieldCodeName}",et.get${MajorKeyFieldCodeName}());
-                ${srfcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service.update(${MajorEntityName});
+            ${MajorEntityName}.set("${MajorKeyFieldCodeName}",et.get${MajorKeyFieldCodeName}());
+            ${srfcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service.update(${MajorEntityName});
             </#if>
         }
                 </#if>