修改查询时间的问题

This commit is contained in:
yangjun 2024-07-16 11:25:39 +08:00
parent 64236e3179
commit 851442e803
2 changed files with 21 additions and 27 deletions

View File

@ -82,20 +82,14 @@ public class AllTaskServiceImpl implements AllTaskSercice {
calendar2.add(Calendar.MONTH, -1); // 获取上个月
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
String lastMonth = format.format(calendar2.getTime());
startTime = lastMonth+"-21 00:00:00";
startTime = lastMonth+"-16 00:00:00";
endTime = lastMonth+"-"+lastDayOfMonth+" 23:59:59";
}else if(dayOfMonth == 11){
}else if(dayOfMonth == 16){
Calendar calendar4 = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
String lastMonth = format.format(calendar4.getTime());
startTime = lastMonth+"-01 00:00:00";
endTime = lastMonth+"-10 23:59:59";
}else if(dayOfMonth == 21){
Calendar calendar4 = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
String lastMonth = format.format(calendar4.getTime());
startTime = lastMonth+"-11 00:00:00";
endTime = lastMonth+"-20 23:59:59";
endTime = lastMonth+"-15 23:59:59";
}
System.out.println("startTime" + startTime);
System.out.println("endTime" + endTime);

View File

@ -13,41 +13,41 @@ public class PeriodUtil {
final Calendar c = Calendar.getInstance();
c.setTime(date);
//如果日期为1号到10号 返回当月1日与10日
if(c.get(Calendar.DAY_OF_MONTH) >=1 && c.get(Calendar.DAY_OF_MONTH)<=10){
if(c.get(Calendar.DAY_OF_MONTH) >=1 && c.get(Calendar.DAY_OF_MONTH)<=15){
c.set(Calendar.DATE,1);
c.set(Calendar.HOUR_OF_DAY, 0);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
period.setStartFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
c.set(Calendar.DATE,10);
c.set(Calendar.DATE,15);
c.set(Calendar.HOUR_OF_DAY, 23);
c.set(Calendar.MINUTE, 59);
c.set(Calendar.SECOND, 59);
c.set(Calendar.MILLISECOND, 999);
period.setEndFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
} else if (c.get(Calendar.DAY_OF_MONTH)>=11 && c.get(Calendar.DAY_OF_MONTH)<=20) {
} else if (c.get(Calendar.DAY_OF_MONTH)>=16 && c.get(Calendar.DAY_OF_MONTH)<=31) {
//如果日期为11号到20号 返回当月11日与20日
c.set(Calendar.DATE,11);
c.set(Calendar.HOUR_OF_DAY, 0);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
period.setStartFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
c.set(Calendar.DATE,20);
c.set(Calendar.HOUR_OF_DAY, 23);
c.set(Calendar.MINUTE, 59);
c.set(Calendar.SECOND, 59);
c.set(Calendar.MILLISECOND, 999);
period.setEndFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
}else if (c.get(Calendar.DAY_OF_MONTH)>=21 && c.get(Calendar.DAY_OF_MONTH)<=31) {
//如果日期为21号到31号 返回当月21日与当月最后一天
c.set(Calendar.DATE,21);
c.set(Calendar.DATE,16);
c.set(Calendar.HOUR_OF_DAY, 0);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
period.setStartFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
// c.set(Calendar.DATE,20);
// c.set(Calendar.HOUR_OF_DAY, 23);
// c.set(Calendar.MINUTE, 59);
// c.set(Calendar.SECOND, 59);
// c.set(Calendar.MILLISECOND, 999);
// period.setEndFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
// }else if (c.get(Calendar.DAY_OF_MONTH)>=21 && c.get(Calendar.DAY_OF_MONTH)<=31) {
// //如果日期为21号到31号 返回当月21日与当月最后一天
// c.set(Calendar.DATE,21);
// c.set(Calendar.HOUR_OF_DAY, 0);
// c.set(Calendar.MINUTE, 0);
// c.set(Calendar.SECOND, 0);
// c.set(Calendar.MILLISECOND, 0);
// period.setStartFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
//获取月底的最后一天
c.set(Calendar.DATE,DateUtil.endOfMonth(c).get(Calendar.DATE));
c.set(Calendar.HOUR_OF_DAY, 23);