diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index febd2de..640da5d 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/src/main/java/com/zh/project0512/controller/UtilsController.java @@ -95,7 +95,7 @@ public class UtilsController { String filePath = path + "/" + newFileName; File dest = new File(filePath); // if (compress != null && compress &&fileTypeNum ==2&& file.getSize() >= picSizeLimit) { - if (file.getSize() >= picSizeLimit) { + if (fileTypeNum ==2&&file.getSize() >= picSizeLimit) { String filePathSmall = path + "/" + newFileNameSmall; File beforeFile = new File(filePathSmall); //生成目标图片 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 5566ef0..7235398 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -521,10 +521,10 @@ public class TaskController { qw.eq("t1.status", param.getStatus()); } if (null != param.getMonth()) { - qw.between("t1.creatAt", LocalDateTime.now().minusMonths(param.getMonth()), LocalDateTime.now()); + qw.between("t1.start", LocalDateTime.now().minusMonths(param.getMonth()), LocalDateTime.now()); } else { - qw.ge(param.getBeginTime() != null, "t1.creatAt", param.getBeginTime()); - qw.le(param.getEndTime() != null, "t1.creatAt", param.getEndTime()); + qw.ge(param.getBeginTime() != null, "t1.start", param.getBeginTime()); + qw.le(param.getEndTime() != null, "t1.start", param.getEndTime()); } if (null != param.getKeyword()) { qw.like("t1.title", param.getKeyword());