zhangjinli 3 years ago
parent 48c6eab9b8
commit ea30168db0

@ -95,7 +95,7 @@ public class UtilsController {
String filePath = path + "/" + newFileName; String filePath = path + "/" + newFileName;
File dest = new File(filePath); File dest = new File(filePath);
// if (compress != null && compress &&fileTypeNum ==2&& file.getSize() >= picSizeLimit) { // if (compress != null && compress &&fileTypeNum ==2&& file.getSize() >= picSizeLimit) {
if (file.getSize() >= picSizeLimit) { if (fileTypeNum ==2&&file.getSize() >= picSizeLimit) {
String filePathSmall = path + "/" + newFileNameSmall; String filePathSmall = path + "/" + newFileNameSmall;
File beforeFile = new File(filePathSmall); File beforeFile = new File(filePathSmall);
//生成目标图片 //生成目标图片

@ -521,10 +521,10 @@ public class TaskController {
qw.eq("t1.status", param.getStatus()); qw.eq("t1.status", param.getStatus());
} }
if (null != param.getMonth()) { 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 { } else {
qw.ge(param.getBeginTime() != null, "t1.creatAt", param.getBeginTime()); qw.ge(param.getBeginTime() != null, "t1.start", param.getBeginTime());
qw.le(param.getEndTime() != null, "t1.creatAt", param.getEndTime()); qw.le(param.getEndTime() != null, "t1.start", param.getEndTime());
} }
if (null != param.getKeyword()) { if (null != param.getKeyword()) {
qw.like("t1.title", param.getKeyword()); qw.like("t1.title", param.getKeyword());

Loading…
Cancel
Save