add

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

@@ -8,4 +8,10 @@ import ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.d
 
 public interface ${item.getCodeName()}Mapper extends BaseMapper<${item.getCodeName()}>{
 
+<#if item.getAllPSDEDataSets()??>
+    <#list item.getAllPSDEDataSets() as dedataset>
+    List<${item.getCodeName()}> search${dedataset.getCodeName()}(@Param("srf") ${item.getCodeName()}SearchFilter searchfilter,@Param("ew") Wrapper<${item.getCodeName()}> wrapper) ;
+    </#list>
+</#if>
+
 }
\ No newline at end of file

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

+<#ibiztemplate>
+TARGET=PSDATAENTITY
+</#ibiztemplate>
+package ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.service;
+
+import ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.domain.${item.codeName};
+import ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.service.dto.${item.codeName}SearchFilter;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Map;
+
+/**
+ * 实体[${item.codeName}] 服务对象接口
+ */
+public interface ${item.codeName}Service extends IService<${item.codeName}>{
+
+<#if item.getAllPSDEDataSets()??>
+	<#list item.getAllPSDEDataSets() as dedataset>
+    List<${item.codeName}> list${dedataset.getCodeName()}(${item.codeName}SearchFilter filter) ;
+	</#list>
+</#if>
+ }
\ No newline at end of file

SLN/%PUBPRJ%-srv/src/main/java/%SYS_PKGPATH%/%MOD_PKGPATH%/service/dto/%DE%SearchFilter.java.ftl

+<#ibiztemplate>
+TARGET=PSDATAENTITY
+</#ibiztemplate>
+package ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.service.dto;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.domain.${item.getCodeName()};
+import org.springframework.util.StringUtils;
+import lombok.Data;
+
+@Data
+public class ${item.getCodeName()}SearchFilter{
+
+	private QueryWrapper<${item.getCodeName()}> selectCond;
+	public ${item.getCodeName()}SearchFilter(){
+		this.selectCond=new QueryWrapper<${item.getCodeName()}>();
+	}
+	/**
+	 * 输出实体搜索项
+	 */
+<#list item.getPSDEFields() as defield>
+	<#list defield.getAllPSDEFSearchModes() as formitem>
+	private ${srfjavatype(formitem.getPSDEField().stdDataType)} ${formitem.getName()?lower_case};//[${defield.getLogicName()}]
+	public void set${formitem.getName()?lower_case?cap_first}(${srfjavatype(formitem.getPSDEField().stdDataType)} ${formitem.getName()?lower_case}) {
+        this.${formitem.getName()?lower_case} = ${formitem.getName()?lower_case};
+        if(!StringUtils.isEmpty(this.${formitem.getName()?lower_case})){
+		<#if formitem.getValueOp() == "LIKE">
+            this.selectCond.like("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case});
+		<#elseif formitem.getValueOp() == "LEFTLIKE">
+            this.selectCond.likeLeft("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case});
+		<#elseif formitem.getValueOp() == "RIGHTLIKE">
+            this.selectCond.likeRight("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case});
+		<#elseif formitem.getValueOp() == "EQ">
+            this.selectCond.eq("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case});
+		<#elseif formitem.getValueOp() == "NOTEQ">
+            this.selectCond.ne("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case});
+		<#elseif formitem.getValueOp() == "GT">
+            this.selectCond.gt("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case});
+		<#elseif formitem.getValueOp() == "GTANDEQ">
+            this.selectCond.ge("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case});
+		<#elseif formitem.getValueOp() == "LT">
+            this.selectCond.lt("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case});
+		<#elseif formitem.getValueOp() == "LTANDEQ">
+            this.selectCond.le("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case});
+		</#if>
+        }
+    }
+	</#list>
+</#list>
+
+}
\ No newline at end of file

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

+<#ibiztemplate>
+TARGET=PSDATAENTITY
+</#ibiztemplate>
+package ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+import ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.mapper.${item.codeName}Mapper;
+import ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.domain.${item.codeName};
+import ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.service.${item.codeName}Service;
+import ${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.service.dto.${item.codeName}SearchFilter;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 实体[${item.codeName}] 服务对象接口实现
+ */
+@Service
+public class ${item.codeName}ServiceImpl extends ServiceImpl<${item.codeName}Mapper, ${item.codeName}> implements ${item.codeName}Service{
+
+    @Resource
+    private ${item.codeName}Mapper ${item.codeName?lower_case}Mapper;
+
+<#if item.getAllPSDEDataSets()??>
+    <#list item.getAllPSDEDataSets() as dedataset>
+	public List<${item.codeName}> list${dedataset.getCodeName()}(${item.codeName}SearchFilter filter) {
+		return ${item.codeName?lower_case}Mapper.search${dedataset.getCodeName()}(filter,filter.getSelectCond());
+	}
+    </#list>
+</#if>
+
+ }
\ No newline at end of file

SLN/%PUBPRJ%-srv/src/main/resources/mapper/%MOD_PKGPATH%/%DE_PKGPATH%/%DE%Mapper.xml.ftl

@@ -26,6 +26,19 @@ TARGET=PSDATAENTITY
 		</#list>
 	</#if>
 
+		<#comment>实体数据查询</#comment>
+		<#list item.getAllPSDEDataQueries() as singleQuery>
+			<#list singleQuery.getAllPSDEDataQueryCodes() as dedqcode>
+	<select id="search${singleQuery.getCodeName()}"  resultMap="${de.codeName}ResultMap">
+        <![CDATA[select t1.* from (
+		${srfjavasqlcode('${dedqcode.getQueryCode()}')}
+        )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>
+    </select>
+			</#list>
+		</#list>
+
 	<#comment>mybatis返回结果映射</#comment>
 	<resultMap id="${de.codeName}ResultMap" type="${pub.getPKGCodeName()}.${item.getPSSystemModule().codeName?lower_case}.domain.${item.codeName}" autoMapping="true">
 		<id property="${item.getKeyPSDEField().codeName?lower_case}" column="${item.getKeyPSDEField().getName()?lower_case}" /><!--主键字段映射-->