分组

SLN/%PUBPRJ%-core/src/main/resources/mapper/%MOD_PKGPATH%/%DE_PKGPATH%/${de.codeName}Mapper.xml.ftl

@@ -146,8 +146,10 @@ TARGET=PSDATAENTITY
 		<#list resultSet as  singleSet>
 			<#if singleSet.getPSDEDataQueries()??>
     <!--数据集合[${singleSet.getCodeName()}]-->
-	 <select id="search${singleSet.getCodeName()}"  parameterType="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.filter.${de.codeName}SearchContext"  resultMap="${de.codeName}ResultMap">
+	 <select id="search${singleSet.getCodeName()}"  parameterType="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.filter.${de.codeName}SearchContext"  <#if singleSet.isEnableGroup()>resultType="java.util.HashMap"<#else>resultMap="${de.codeName}ResultMap"</#if>>
+	 <#if singleSet.isEnableGroup()>
 	 	select <#list singleSet.getPSDEDataSetGroupParams() as groupParam><#if groupParam_index gt 0>,</#if><#if groupParam.isEnableGroup()>${groupParam.getName()}<#else>${groupParam.getGroupCode()}</#if> as "${groupParam.getName()?lower_case}"</#list> from (
+	 </#if>
          select t1.* from (
             <#list singleSet.getPSDEDataQueries() as dataQuery>
 				<#if dataQuery_index gt 0>
@@ -158,8 +160,10 @@ TARGET=PSDATAENTITY
          )t1
          <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere"><#noparse>${ew.sqlSegment}</#noparse></if></where>
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere"><#noparse>${ew.sqlSegment}</#noparse></if>
+	<#if singleSet.isEnableGroup()> 
 		 )
 		 group by <#assign groupIndex = 0 ><#list singleSet.getPSDEDataSetGroupParams() as groupParam><#if groupParam.isEnableGroup()><#if groupIndex gt 0>,</#if>${groupParam.getName()?lower_case}<#assign groupIndex = groupIndex + 1 ></#if></#list>
+	</#if>
      </select>
 
 			</#if>

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

@@ -276,7 +276,7 @@ public class ${itemCodeName}Resource {
                 .header("x-total", String.valueOf(domains.getTotalElements()))
                 .body(domains.getContent());
         <#else>
-        Page<${deCodeNameLC}> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
+        Page<${deCodeName}> domains = ${deCodeNameLC}Service.search${deds.getCodeName()}(context) ;
         List<${itemCodeName}DTO> list = ${itemCodeNameLC}Mapping.toDto(domains.getContent());
         return ResponseEntity.status(${statusCode})
                 .header("x-page", String.valueOf(context.getPageable().getPageNumber()))