实体关系属性映射

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

@@ -649,7 +649,7 @@ ${deaction.getRender().code}
                 <#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>
                     <#assign MajorEntity = MinorPSDER.getMajorPSDataEntity()>
                     <#assign MajorEntityName=srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')>
-                    <#assign MajorKeyFieldName =MinorPSDER.getPSPickupDEField().name>
+                    <#assign MajorKeyFieldName =MinorPSDER.getPSPickupDEField().name?lower_case>
                     <#assign MajorKeyFieldCodeName =srfcaseformat(MinorPSDER.getPSPickupDEField().codeName,'l_u2lC')?cap_first>
                     <#assign MajorEntityService=srfcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName(),'l_u2lC')+"Service">
         //实体关系[${MinorPSDER.name}]
@@ -658,10 +658,12 @@ ${deaction.getRender().code}
                 ${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 MajorEntityDEFieldName=derField.getMajorPSDEField().name>
+                        <#assign MajorEntityDEFieldName=derField.getMajorPSDEField().name?lower_case>
+                        <#assign MajorEntityDEFieldCodeName=srfcaseformat(derField.getMajorPSDEField().codeName,'l_u2lC')?cap_first>
                         <#if derField.getMapType()=="COUNT">
-                ${MajorEntityName}.set("${MajorEntityDEFieldName}",baseMapper.selectCount(new QueryWrapper()));
+                ${MajorEntityName}.set("${MajorEntityDEFieldCodeName}",baseMapper.selectCount(new QueryWrapper()));
                         <#else>
+                            <#assign MinorEntityDEFieldName=derField.getMinorPSDEField().name>
                             <#if derField.getMapType()=="SUM">
                                 <#assign derFieldType="sum("+MajorEntityDEFieldName+")">
                             <#elseif derField.getMapType()=="AVG">
@@ -674,12 +676,12 @@ ${deaction.getRender().code}
                             <#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("${MajorEntityDEFieldName}",objects_${derField_index}.get(0));
+                    ${MajorEntityName}.set("${MajorEntityDEFieldCodeName}",objects_${derField_index}.get(0));
                 }
 
                             </#if>
                         </#if>
-                ${MajorEntityName}.set("${MajorKeyFieldCodeName}","et.get${MajorKeyFieldCodeName}()");
+                ${MajorEntityName}.set("${MajorKeyFieldCodeName}",et.get${MajorKeyFieldCodeName}());
                 ${srfcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service.update(${MajorEntityName});
                     </#if>
                 </#list>