Browse Source

fix:加上录入时间查询

master
buaixuexideshitongxue 4 weeks ago
parent
commit
5063781980
  1. 7
      src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java
  2. 2
      src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java
  3. 3
      src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java

7
src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java

@ -2,6 +2,7 @@ package com.biutag.supervision.pojo.param.ComplaintCollection;
import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionSourceTableEnum; import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionSourceTableEnum;
import com.biutag.supervision.pojo.param.BasePage; import com.biutag.supervision.pojo.param.BasePage;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -112,6 +113,12 @@ public class ComplaintCollectionQueryParam extends BasePage {
private List<String> involveProblemIdList = new ArrayList<>(); private List<String> involveProblemIdList = new ArrayList<>();
@Schema(description = "录入时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private List<LocalDateTime> createTimeList = new ArrayList<>();
// @Schema(description = "部门ID集合") // @Schema(description = "部门ID集合")
// private Set<String> secondDepartIds; // private Set<String> secondDepartIds;

2
src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java

@ -84,7 +84,7 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe
@Schema(description = "录入时间") @Schema(description = "录入时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private List<LocalDateTime> crtTime = new ArrayList<>(); private List<LocalDateTime> createTimeList = new ArrayList<>();
@Override @Override

3
src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java

@ -66,6 +66,9 @@ public class ComplaintCollectionResourceService extends BaseDAO {
&& param.getDiscoveryTimeList().get(1) != null) { && param.getDiscoveryTimeList().get(1) != null) {
qw.between(ComplaintCollection::getDiscoveryTime, param.getDiscoveryTimeList().get(0), param.getDiscoveryTimeList().get(1)); qw.between(ComplaintCollection::getDiscoveryTime, param.getDiscoveryTimeList().get(0), param.getDiscoveryTimeList().get(1));
} }
if (CollectionUtil.size(param.getCreateTimeList()) == 2){
qw.between(ComplaintCollection::getCreateTime, param.getCreateTimeList().get(0), param.getCreateTimeList().get(1));
}
// 来件人信息 // 来件人信息
if (StrUtil.isNotBlank(param.getPersonInfo())) { if (StrUtil.isNotBlank(param.getPersonInfo())) {
String kw = param.getPersonInfo(); String kw = param.getPersonInfo();

Loading…
Cancel
Save