|
@@ -50,8 +50,14 @@ public class ProdProductionServiceImpl extends ServiceImpl<ProdProductionMapper,
|
|
String firstDay = format.format(cal_1.getTime());
|
|
String firstDay = format.format(cal_1.getTime());
|
|
queryWrapper.ge("creat_time", firstDay);
|
|
queryWrapper.ge("creat_time", firstDay);
|
|
} else {
|
|
} else {
|
|
- startTime = startTime + " 00:00:00";
|
|
|
|
- endTime = endTime + " 23:59:59";
|
|
|
|
|
|
+ startTime = startTime +"-01-" + " 00:00:00";
|
|
|
|
+ String[] split = endTime.split("-");
|
|
|
|
+ if (split[1].equals("01") || split[1].equals("03") || split[1].equals("05")
|
|
|
|
+ || split[1].equals("07") || split[1].equals("08") || split[1].equals("10") || split[1].equals("12")) {
|
|
|
|
+ endTime = endTime + "-31-"+" 23:59:59";
|
|
|
|
+ } else {
|
|
|
|
+ endTime = endTime + "-30-"+" 23:59:59";
|
|
|
|
+ }
|
|
queryWrapper.between("creat_time", startTime, endTime);
|
|
queryWrapper.between("creat_time", startTime, endTime);
|
|
}
|
|
}
|
|
|
|
|