调整多层关系嵌套数据服务

APP/src/service/%DE_PKGPATH%/%DE_PKGPATH%-service-base.ts.ftl

@@ -91,33 +91,66 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
             <#if singleServiceApi.getRequestParamType() == "NONE">
             <#-- 无参数情况start -->
         if(${condition}true){
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
+            let res:any = await Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
+            res.data.${item.getCodeName()?lower_case} = data.${item.getCodeName()?lower_case};
+            <@setStore appEntity=item />
+            return res;
         }
             <#-- 无参数情况end -->
             <#elseif singleServiceApi.getRequestParamType() == "FIELD">
             <#-- 指定属性情况start -->
         if(${condition}context.${item.getCodeName()?lower_case}){
+            <#-- 指定属性情况start -->
+            <#-- GET -->
+            <#if singleServiceApi.getRequestMethod() == "GET">
+            let res:any = await Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
+            <@setStore appEntity=item />
+            return res;
+            <#elseif singleServiceApi.getRequestMethod() == "POST">
+            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+            <#else>
             return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
+            </#if>
+            <#-- 指定属性情况end -->
         }
             <#-- 指定属性情况start -->
             <#elseif singleServiceApi.getRequestParamType() == "ENTITY">
             <#-- 提交对象数据情况start -->
             <#if singleAppMethod.getCodeName() == 'Create'>
         if(${condition}true){
+            let masterData:any = {};
+            <@getStore appEntity=item />
+            Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
             }
             if(data.srffrontuf){
                 delete data.srffrontuf;
             }
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}`,data,isloading);
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}`,data,isloading);
+            <#if item.getMajorPSAppDERSs()??>
+            <#list item.getMajorPSAppDERSs() as deReRs>
+            <#-- 主实体 -->
+            <#assign majorPSAppDataEntity = deReRs.getMajorPSAppDataEntity() />
+            <#-- 从实体 -->
+            <#assign minorPSAppDataEntity = deReRs.getMinorPSAppDataEntity() />
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}',JSON.stringify(res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}));
+            </#list>
+            </#if>
+            return res;
         }
             <#else>
         if(${condition}context.${item.getCodeName()?lower_case}){
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+            let masterData:any = {};
+            <@getStore appEntity=item />
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+            <@setStore appEntity=item />
+            return res;
         }
             </#if>
-            <#-- 提交对象数据情况start -->
+            <#-- 提交对象数据情况end -->
             <#else>
             <#-- URI参数传递情况start -->
         // URI参数传递情况未实现
@@ -172,8 +205,7 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
             return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
         <#--  }     -->
             </#if>
-
-            <#-- 指定属性情况start -->
+            <#-- 指定属性情况end -->
             <#elseif singleServiceApi.getRequestParamType() == "ENTITY">
             <#-- 提交对象数据情况start -->
         <#if singleAppMethod.getCodeName() == 'Update'>
@@ -221,7 +253,7 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
             return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
         <#--  }  -->
         </#if>
-            <#-- 提交对象数据情况start -->
+            <#-- 提交对象数据情况end -->
             <#else>
             <#-- URI参数传递情况start -->
         // URI参数传递情况未实现