高级筛选新增类型，自定义筛选新增类型

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java

@@ -19,10 +19,7 @@ import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService;
 import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchchildService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,6 +68,7 @@ public class OcrUsersearchController extends BaseController{
 	@GetMapping(value = "/list")
 	public ResultVo<IPage<OcrUsersearch>> queryPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														@RequestParam(name="type") @ApiParam(value = "类型(首页为0，终审为1)", required = true) Integer type,
 														  HttpServletRequest request) {
 		//获取当前登录人
 		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
@@ -93,6 +91,7 @@ public class OcrUsersearchController extends BaseController{
 
 		queryWrapper.eq("USERID",userToken.getUserid());
 		queryWrapper.eq("TENANTID",tenantId);
+		queryWrapper.eq("TYPE",type);
 		queryWrapper.orderByDesc(Arrays.asList("IZTOP","REORDER"));
 		
 		IPage<OcrUsersearch> pageList = ocrUsersearchService.selectSearchListPage(paramterPage, queryWrapper);
@@ -133,7 +132,8 @@ public class OcrUsersearchController extends BaseController{
 		ocrUsersearch.setCreatetime(System.currentTimeMillis());
 		ocrUsersearch.setCreateby(userToken.getLoginname());
 		ocrUsersearch.setTenantid(Long.parseLong(tenantId));
-		ocrUsersearch.setReorder(this.ocrUsersearchService.getReorder(ocrUsersearch.getUserid()));
+		ocrUsersearch.setReorder(this.ocrUsersearchService.getReorder(ocrUsersearch.getUserid(),ocrUsersearch.getType()));
+		ocrUsersearch.setType(ocrUsersearch.getType());
 		if(null != ocrUsersearch.getId()){
 			this.ocrUsersearchService.removeByIds(ocrUsersearch.getId().toString());
 		}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUsersearch.java

@@ -28,91 +28,96 @@ import java.util.stream.Stream;
 import java.util.stream.Collectors;
 
 
-
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(name = "个人过滤条件", title = "个人过滤条件")
 @TableName(value = "ocr_usersearch")
-public class OcrUsersearch implements BaseDto,java.io.Serializable {
+public class OcrUsersearch implements BaseDto, java.io.Serializable {
-	
+
-	private static final long serialVersionUID = 3214150960755020489L;
+    private static final long serialVersionUID = 3214150960755020489L;
-	@Schema(description = "主键")
+    @Schema(description = "主键")
-	@TableId(value = "id",type = IdType.ASSIGN_ID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
-	@JsonSerialize(using = ToStringSerializer.class)
+    @JsonSerialize(using = ToStringSerializer.class)
-	@TableField(value="ID")
+    @TableField(value = "ID")
-	private Long id;
+    private Long id;
-	
+
-	@Schema(description = "创建人")
+    @Schema(description = "创建人")
-	@TableField(value="CREATEBY")
+    @TableField(value = "CREATEBY")
-	private String createby;
+    private String createby;
-	
+
-	@Schema(description = "创建时间")
+    @Schema(description = "创建时间")
-	@JsonSerialize(using = DateSerializer.class)
+    @JsonSerialize(using = DateSerializer.class)
-	@TableField(value="CREATETIME")
+    @TableField(value = "CREATETIME")
-	private Long createtime;
+    private Long createtime;
-	
+
-	@Schema(description = "修改人")
+    @Schema(description = "修改人")
-	@TableField(value="UPDATEBY")
+    @TableField(value = "UPDATEBY")
-	private String updateby;
+    private String updateby;
-	
+
-	@Schema(description = "修改时间")
+    @Schema(description = "修改时间")
-	@JsonSerialize(using = DateSerializer.class)
+    @JsonSerialize(using = DateSerializer.class)
-	@TableField(value="UPDATETIME")
+    @TableField(value = "UPDATETIME")
-	private Long updatetime;
+    private Long updatetime;
-	
+
-	@Schema(description = "租户ID--通过公司代码做匹配")
+    @Schema(description = "租户ID--通过公司代码做匹配")
-	@JsonSerialize(using = ToStringSerializer.class)
+    @JsonSerialize(using = ToStringSerializer.class)
-	@TableField(value="TENANTID")
+    @TableField(value = "TENANTID")
-	private Long tenantid;
+    private Long tenantid;
-	
+
-	@Schema(description = "所属用户主键")
+    @Schema(description = "所属用户主键")
-	@JsonSerialize(using = ToStringSerializer.class)
+    @JsonSerialize(using = ToStringSerializer.class)
-	@TableField(value="USERID")
+    @TableField(value = "USERID")
-	private Long userid;
+    private Long userid;
-	
+
-	@Schema(description = "筛选名称")
+    @Schema(description = "筛选名称")
-	@TableField(value="SEARCHNAME")
+    @TableField(value = "SEARCHNAME")
-	private String searchname;
+    private String searchname;
-	
+
-	@Schema(description = "排序字段")
+    @Schema(description = "排序字段")
-	@TableField(value="REORDER")
+    @TableField(value = "REORDER")
-	private Integer reorder;
+    private Integer reorder;
-	
+
-	@Schema(description = "是否置顶，默认为0，表示不置顶")
+    @Schema(description = "是否置顶，默认为0，表示不置顶")
-	@TableField(value="IZTOP")
+    @TableField(value = "IZTOP")
-	private Integer iztop;
+    private Integer iztop;
-	
+
-	@TableField(exist = false)
+    @Schema(description = "类型，首页为0，终审为1")
-	private List<OcrUsersearchchild> ocrUsersearchchildList;
+    @TableField(value = "TYPE")
-
+    private Integer type;
-	//保存当前登录用户的数据权限范围的搜索条件
+
-	@TableField(exist = false)
+    @TableField(exist = false)
-	@JsonIgnore
+    private List<OcrUsersearchchild> ocrUsersearchchildList;
-	private SearchQuery searchQueryrolesShowleave;
+
-
+    //保存当前登录用户的数据权限范围的搜索条件
-	@TableField(exist = false)
+    @TableField(exist = false)
-	@JsonIgnore
+    @JsonIgnore
-	private final Map<String,String> query = Stream.of(
+    private SearchQuery searchQueryrolesShowleave;
-		new SimpleEntry<>("ID","id"),
+
-		new SimpleEntry<>("CREATEBY","createby"),
+    @TableField(exist = false)
-		new SimpleEntry<>("CREATETIME","createtime"),
+    @JsonIgnore
-		new SimpleEntry<>("UPDATEBY","updateby"),
+    private final Map<String, String> query = Stream.of(
-		new SimpleEntry<>("UPDATETIME","updatetime"),
+            new SimpleEntry<>("ID", "id"),
-		new SimpleEntry<>("TENANTID","tenantid"),
+            new SimpleEntry<>("CREATEBY", "createby"),
-		new SimpleEntry<>("USERID","userid"),
+            new SimpleEntry<>("CREATETIME", "createtime"),
-		new SimpleEntry<>("SEARCHNAME","searchname"),
+            new SimpleEntry<>("UPDATEBY", "updateby"),
-		new SimpleEntry<>("REORDER","reorder"),
+            new SimpleEntry<>("UPDATETIME", "updatetime"),
-		new SimpleEntry<>("IZTOP","iztop")
+            new SimpleEntry<>("TENANTID", "tenantid"),
-	)
+            new SimpleEntry<>("USERID", "userid"),
-	.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
+            new SimpleEntry<>("SEARCHNAME", "searchname"),
-	@Override
+            new SimpleEntry<>("REORDER", "reorder"),
-	public String getQueryFiled(String filedname){
+            new SimpleEntry<>("IZTOP", "iztop"),
-		String obj = null;
+            new SimpleEntry<>("TYPE", "type")
-		if(null != query && query.size() > 0){
+    )
-		obj = query.get(filedname);
+            .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
-		}
+
-		return obj;
+    @Override
-	}
+    public String getQueryFiled(String filedname) {
+        String obj = null;
+        if (null != query && query.size() > 0) {
+            obj = query.get(filedname);
+        }
+        return obj;
+    }
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUsersearchService.java

@@ -28,7 +28,7 @@ public interface OcrUsersearchService extends BaseService<OcrUsersearch>  {
      * @param userid
      * @return
      */
-    public int getReorder(Long userid);
+    public int getReorder(Long userid,Integer type);
 
     /**
      * 根据id检索出对应的预设条件

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchServiceImpl.java

@@ -51,9 +51,10 @@ public class OcrUsersearchServiceImpl extends BaseServiceImpl<OcrUsersearchMybat
 	 * @param userid
 	 * @return
 	 */
-	public int getReorder(Long userid){
+	public int getReorder(Long userid,Integer type){
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("USERID",userid);
+		queryWrapper.eq("TYPE",type);
 		queryWrapper.orderByDesc("REORDER");
 
 		List<OcrUsersearch> list = this.ocrusersearchmybatisdao.selectList(queryWrapper);

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUsersearchMapper.xml

@@ -12,6 +12,7 @@
 		<result column="SEARCHNAME" property="searchname" jdbcType="VARCHAR"/>
 		<result column="REORDER" property="reorder" jdbcType="INTEGER"/>
 		<result column="IZTOP" property="iztop" jdbcType="INTEGER"/>
+		<result column="TYPE" property="type" jdbcType="INTEGER"/>
 	</resultMap>
 	<sql id="Base_Column_List">
 		ID AS id,