diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java index 527b51e..b867a30 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -716,6 +716,12 @@ public class TaskController { private String providerName; @Schema(title = "部门id") private Integer departmentId; + @Schema(title = "开始时间(yyyy-MM-dd HH:mm:ss)") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime beginTime; + @Schema(title = "结束时间(yyyy-MM-dd HH:mm:ss)") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; private Integer pageNum; private Integer pageSize; } @@ -730,6 +736,8 @@ public class TaskController { qw.like(param.getBrand() != null, "t1.brandList", param.getBrand()); qw.like(param.getProviderName() != null, "t2.name", param.getProviderName()); qw.inSql(param.getDepartmentId() != null,"t2.openid","SELECT openid from qywxDepartmentUserLink WHERE qywxDepartmentUserLink.departmentId = "+param.getDepartmentId()); + qw.ge(param.getBeginTime() != null, "t1.creatAt", param.getBeginTime()); + qw.le(param.getEndTime() != null, "t1.creatAt", param.getEndTime()); IPage iPage = customerActionNoteService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), null, qw); List records = iPage.getRecords(); for (Map m : records) {