更新SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/mapper/%DE%...

更新SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/mapper/%DE%Mapper.java.ftl, SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/I%DE%Service.java.ftl, SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/rest/%ITEM%Resource.java.ftl

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/mapper/%DE%Mapper.java.ftl

@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().codeName?lower_case}.domain.${item.getCodeName()};
 import ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.filter.${de.codeName}SearchContext;
@@ -30,7 +30,7 @@ public interface ${item.getCodeName()}Mapper extends BaseMapper<${item.getCodeNa
 
 <#if item.getAllPSDEDataSets()??>
 <#list item.getAllPSDEDataSets() as dedataset>
-    Page<<#if dedataset.isEnableGroup()>HashMap<#else>${item.getCodeName()}</#if>> search${dedataset.getCodeName()}(IPage page, @Param("srf") ${de.codeName}SearchContext context, @Param("ew") Wrapper<${item.getCodeName()}> wrapper);
+    Page<<#if dedataset.isEnableGroup()>Map<#else>${item.getCodeName()}</#if>> search${dedataset.getCodeName()}(IPage page, @Param("srf") ${de.codeName}SearchContext context, @Param("ew") Wrapper<${item.getCodeName()}> wrapper);
 </#list>
 </#if>
     <#assign keyfieldCodeName=srfcaseformat(item.getKeyPSDEField().codeName,'l_u2lC')>

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/I%DE%Service.java.ftl

@@ -166,7 +166,7 @@ public interface I${item.codeName}Service {
     </#if>
     <#if item.getAllPSDEDataSets()??>
         <#list item.getAllPSDEDataSets() as dedataset>
-    Page<<#if dedataset.isEnableGroup()>HashMap<#else>${item.getCodeName()}</#if>> search${dedataset.getCodeName()}(${item.codeName}SearchContext context);
+    Page<<#if dedataset.isEnableGroup()>Map<#else>${item.getCodeName()}</#if>> search${dedataset.getCodeName()}(${item.codeName}SearchContext context);
         </#list>
     </#if>
     <#comment>1：N关系中，在子实体中创建父实体的实例对象</#comment>

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/rest/%ITEM%Resource.java.ftl

@@ -285,10 +285,10 @@ public class ${itemCodeName}Resource {
                 <@DataQuerySecurityAnnotation deds/>
 	@ApiOperation(value = "获取${deds.getLogicName()}", tags = {"${deLogicName}" } ,notes = "获取${deds.getLogicName()}")
     @RequestMapping(method= RequestMethod.${reqMtd} , value="${fullPath}/fetch<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()?lower_case}<#else>${deds.getCodeName()?lower_case}</#if>")
-	public ResponseEntity<List<<#if deds.isEnableGroup()>HashMap<#else>${itemCodeName}DTO</#if>>> fetch<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()}<#else>${deds.getCodeName()}</#if>(<#if reqMtd!='GET'>@RequestBody </#if>${deCodeName}SearchContext context) {
+	public ResponseEntity<List<<#if deds.isEnableGroup()>Map<#else>${itemCodeName}DTO</#if>>> fetch<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()}<#else>${deds.getCodeName()}</#if>(<#if reqMtd!='GET'>@RequestBody </#if>${deCodeName}SearchContext context) {
         <#--${parentSearchParams}-->
         <#if deds.isEnableGroup()>
-        Page<HashMap> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
+        Page<Map> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
         return ResponseEntity.status(${statusCode})
                 .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
                 .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
@@ -308,10 +308,10 @@ public class ${itemCodeName}Resource {
                <@DataQuerySecurityAnnotation deds/>
 	@ApiOperation(value = "查询${deds.getLogicName()}", tags = {"${deLogicName}" } ,notes = "查询${deds.getLogicName()}")
     @RequestMapping(method= RequestMethod.POST , value="${fullPath}/search<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()?lower_case}<#else>${deds.getCodeName()?lower_case}</#if>")
-	public ResponseEntity<Page<<#if deds.isEnableGroup()>HashMap<#else>${itemCodeName}DTO</#if>>> search<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()}<#else>${deds.getCodeName()}</#if>(@RequestBody ${deCodeName}SearchContext context) {
+	public ResponseEntity<Page<<#if deds.isEnableGroup()>Map<#else>${itemCodeName}DTO</#if>>> search<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()}<#else>${deds.getCodeName()}</#if>(@RequestBody ${deCodeName}SearchContext context) {
         <#--${parentSearchParams}-->
         <#if deds.isEnableGroup()>
-        Page<HashMap> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
+        Page<Map> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
 	    return ResponseEntity.status(${statusCode})
                 .body(new PageImpl(domains.getContent(), context.getPageable(), domains.getTotalElements()));
         <#else>
@@ -637,10 +637,10 @@ public class ${itemCodeName}Resource {
                 <@DataQuerySecurityAnnotation deds/>
 	@ApiOperation(value = "${byTagParams}获取${deds.getLogicName()}", tags = {"${deLogicName}" } ,notes = "${byTagParams}获取${deds.getLogicName()}")
     @RequestMapping(method= RequestMethod.${reqMtd} , value="${fullPath}/fetch<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()?lower_case}<#else>${deds.getCodeName()?lower_case}</#if>")
-	public ResponseEntity<List<<#if deds.isEnableGroup()>HashMap<#else>${itemCodeName}DTO</#if>>> fetch${itemCodeName}<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()}<#else>${deds.getCodeName()}</#if>${byParams}(<#if parentParams!="">${parentParams},</#if><#if reqMtd!='GET'>@RequestBody </#if>${deCodeName}SearchContext context) {
+	public ResponseEntity<List<<#if deds.isEnableGroup()>Map<#else>${itemCodeName}DTO</#if>>> fetch${itemCodeName}<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()}<#else>${deds.getCodeName()}</#if>${byParams}(<#if parentParams!="">${parentParams},</#if><#if reqMtd!='GET'>@RequestBody </#if>${deCodeName}SearchContext context) {
         ${parentSearchParams}
         <#if deds.isEnableGroup()>
-        Page<HashMap> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
+        Page<Map> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
 	    return ResponseEntity.status(${statusCode})
                 .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
                 .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
@@ -660,10 +660,10 @@ public class ${itemCodeName}Resource {
             <@DataQuerySecurityAnnotation deds/>
 	@ApiOperation(value = "${byTagParams}查询${deds.getLogicName()}", tags = {"${deLogicName}" } ,notes = "${byTagParams}查询${deds.getLogicName()}")
     @RequestMapping(method= RequestMethod.POST , value="${fullPath}/search<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()?lower_case}<#else>${deds.getCodeName()?lower_case}</#if>")
-	public ResponseEntity<Page<<#if deds.isEnableGroup()>HashMap<#else>${itemCodeName}DTO</#if>>> search${itemCodeName}<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()}<#else>${deds.getCodeName()}</#if>${byParams}(<#if parentParams!="">${parentParams}, @RequestBody </#if>${deCodeName}SearchContext context) {
+	public ResponseEntity<Page<<#if deds.isEnableGroup()>Map<#else>${itemCodeName}DTO</#if>>> search${itemCodeName}<#if (deds.getName()=='DEFAULT')>${deds.getCodeName()}<#else>${deds.getCodeName()}</#if>${byParams}(<#if parentParams!="">${parentParams}, @RequestBody </#if>${deCodeName}SearchContext context) {
         ${parentSearchParams}
         <#if deds.isEnableGroup()>
-        Page<HashMap> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
+        Page<Map> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
 	    return ResponseEntity.status(${statusCode})
                 .body(new PageImpl(domains.getContent(), context.getPageable(), domains.getTotalElements()));
         <#else>