提交 09580113 编写于 作者: zhouweidong's avatar zhouweidong

修复处理逻辑fillParentData查询问题

上级 bb103705
...@@ -21,7 +21,7 @@ import ${pub.getPKGCodeName()}.util.annotation.DEField; ...@@ -21,7 +21,7 @@ import ${pub.getPKGCodeName()}.util.annotation.DEField;
import ${pub.getPKGCodeName()}.util.enums.DEPredefinedFieldType; import ${pub.getPKGCodeName()}.util.enums.DEPredefinedFieldType;
import ${pub.getPKGCodeName()}.util.enums.DEFieldDefaultValueType; import ${pub.getPKGCodeName()}.util.enums.DEFieldDefaultValueType;
import java.io.Serializable; import java.io.Serializable;
import lombok.Data; import lombok.*;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
<#comment>SQL存储-Mybatis</#comment> <#comment>SQL存储-Mybatis</#comment>
...@@ -34,7 +34,11 @@ import ${pub.getPKGCodeName()}.util.domain.EntityMP; ...@@ -34,7 +34,11 @@ import ${pub.getPKGCodeName()}.util.domain.EntityMP;
/** /**
* 实体[${item.getLogicName()}] * 实体[${item.getLogicName()}]
*/ */
@Data @Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "${item.getTableName()}",resultMap = "${item.codeName}ResultMap") @TableName(value = "${item.getTableName()}",resultMap = "${item.codeName}ResultMap")
public class ${item.getCodeName()} extends EntityMP implements Serializable { public class ${item.getCodeName()} extends EntityMP implements Serializable {
......
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.Data; import lombok.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
...@@ -29,7 +29,11 @@ import ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().codeName?lower_ca ...@@ -29,7 +29,11 @@ import ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().codeName?lower_ca
* 关系型数据实体[${item.codeName}] 查询条件对象 * 关系型数据实体[${item.codeName}] 查询条件对象
*/ */
@Slf4j @Slf4j
@Data @Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class ${item.codeName}SearchContext extends QueryWrapperContext<${item.codeName}> { public class ${item.codeName}SearchContext extends QueryWrapperContext<${item.codeName}> {
<#list item.getPSDEFields() as defield> <#list item.getPSDEFields() as defield>
......
...@@ -6,11 +6,15 @@ package ${pub.getPKGCodeName()}.util.filter; ...@@ -6,11 +6,15 @@ package ${pub.getPKGCodeName()}.util.filter;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.mongodb.QueryBuilder; import com.mongodb.QueryBuilder;
import lombok.Data; import lombok.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j
@Data @Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class QueryBuildContext extends SearchContextBase implements ISearchContext{ public class QueryBuildContext extends SearchContextBase implements ISearchContext{
@JsonIgnore @JsonIgnore
......
...@@ -8,7 +8,7 @@ import com.alibaba.fastjson.annotation.JSONField; ...@@ -8,7 +8,7 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
...@@ -20,7 +20,11 @@ import java.util.Iterator; ...@@ -20,7 +20,11 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
@Slf4j @Slf4j
@Data @Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class QueryWrapperContext<T> extends SearchContextBase implements ISearchContext{ public class QueryWrapperContext<T> extends SearchContextBase implements ISearchContext{
@JsonIgnore @JsonIgnore
......
...@@ -7,7 +7,7 @@ import ${pub.getPKGCodeName()}.util.security.AuthenticationUser; ...@@ -7,7 +7,7 @@ import ${pub.getPKGCodeName()}.util.security.AuthenticationUser;
import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
...@@ -20,7 +20,11 @@ import java.util.List; ...@@ -20,7 +20,11 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@Slf4j @Slf4j
@Data @Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class SearchContextBase implements ISearchContext{ public class SearchContextBase implements ISearchContext{
/** /**
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册