fixed:查询条件补充

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java

@@ -30,6 +30,29 @@ public class CorpInfoPageQry extends PageQuery {
      * - `le`: 小于等于比较查询
      * - `ne`: 不等比较查询，对应SQL的!=操作符
      */
+
+    @ApiModelProperty(value = "开户开始时间", name = "geCreateTime", required = true)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate geCreateTime;
+
+    @ApiModelProperty(value = "开户结束时间", name = "leCreateTime", required = true)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate leCreateTime;
+
+    @ApiModelProperty(value = "成立开始时间", name = "geCreateDate", required = true)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate geCreateDate;
+
+    @ApiModelProperty(value = "成立结束时间", name = "leCreateDate", required = true)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate leCreateDate;
+
+    @ApiModelProperty(value = "企业类型", name = "eqType")
+    private Integer eqType;
+
+    @ApiModelProperty(value = "启用状态", name = "eqUseFlag")
+    private Integer eqUseFlag;
+
 //    @ApiModelProperty(value = "企业id", name = "eqCorpinfoId")
 //    private Long eqCorpinfoId;
     @ApiModelProperty(value = "企业名称", name = "likecorpName")
@@ -47,9 +70,7 @@ public class CorpInfoPageQry extends PageQuery {
 
     @ApiModelProperty(value = "规模", name = "scale", required = true)
     private String eqScale;
-    @ApiModelProperty(value = "成立时间", name = "createDate", required = true)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate eqCreateDate;
+
     @ApiModelProperty(value = "企业状态", name = "corpState", required = true)
     private String eqCorpState;
 

web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java

@@ -1,6 +1,7 @@
 package com.zcloud.basic.info.dto;
 
 import com.alibaba.cola.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -27,7 +28,13 @@ public class UserPageQry extends PageQuery {
     private Long eqDepartmentId;
     private Long eqPostId;
     private String likeName;
+    private String likeUsername;
     private Integer allFlag;
 
+    @ApiModelProperty(value = "人员类型")
+    private String eqPersonnelType;
+    @ApiModelProperty(value = "身份证号")
+    private String likeUserIdCard;
+
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java

@@ -1,6 +1,7 @@
 package com.zcloud.basic.info.dto.clientobject;
 
 import com.alibaba.cola.dto.ClientObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -234,6 +235,7 @@ public class CorpInfoCO extends ClientObject {
     private String createName;
     //创建时间
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime createTime;
     //更新人
     @ApiModelProperty(value = "更新人")