Skip to content

H
haoban-manage3.0
Commit 549607d0 by 王祖波
Options

时间格式化

parent c8c56118
Showing with 2 additions and 2 deletions
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/potential/adaptor/PotentialDataAdaptor.java
...@@ -241,11 +241,11 @@ public class PotentialDataAdaptor { ...@@ -241,11 +241,11 @@ public class PotentialDataAdaptor {
String endDate = bizDate; String endDate = bizDate;
String beginDate = bizDate; String beginDate = bizDate;
if (MaterialReportType.MONTH.getCode().equals(reportType)) { if (MaterialReportType.MONTH.getCode().equals(reportType)) {
DateTime date = cn.hutool.core.date.DateUtil.parse("yyyy-MM"); DateTime date = cn.hutool.core.date.DateUtil.parse(bizDate,"yyyy-MM");
beginDate = cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.beginOfMonth(date), "yyyy-MM-dd"); beginDate = cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.beginOfMonth(date), "yyyy-MM-dd");
endDate = cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.endOfMonth(date), "yyyy-MM-dd"); endDate = cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.endOfMonth(date), "yyyy-MM-dd");
}else { }else {
DateTime date = cn.hutool.core.date.DateUtil.parse("yyyy-MM-dd"); DateTime date = cn.hutool.core.date.DateUtil.parse(bizDate,"yyyy-MM-dd");
endDate = cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.endOfWeek(date), "yyyy-MM-dd"); endDate = cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.endOfWeek(date), "yyyy-MM-dd");
} }
Pair<String, String> pair = new Pair<>(beginDate, endDate); Pair<String, String> pair = new Pair<>(beginDate, endDate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment