Commit 893295d9 authored by huagnxiner's avatar huagnxiner

回访报表日期设置问题bug修改

parent 33d70eb5
...@@ -3624,10 +3624,10 @@ public class StatisticController extends BaseController { ...@@ -3624,10 +3624,10 @@ public class StatisticController extends BaseController {
model.addAttribute("endTime", endTime); model.addAttribute("endTime", endTime);
if (StringUtils.isBlank(startTime) && StringUtils.isBlank(endTime)) { if (StringUtils.isBlank(startTime) && StringUtils.isBlank(endTime)) {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.add(Calendar.DATE, -1); cal.add(Calendar.DATE, 0);
Date d = cal.getTime(); Date d = cal.getTime();
SimpleDateFormat sp = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sp = new SimpleDateFormat("yyyy-MM-dd");
//获取天日期 //获取天日期
String yesterday = sp.format(d); String yesterday = sp.format(d);
startTime = yesterday + " 00:00:00"; startTime = yesterday + " 00:00:00";
endTime = yesterday + " 23:59:59"; endTime = yesterday + " 23:59:59";
......
...@@ -174,17 +174,17 @@ ...@@ -174,17 +174,17 @@
var startTime = $("#startTime"); var startTime = $("#startTime");
var endTime = $("#endTime"); var endTime = $("#endTime");
endTime.bind("focus", function () { endTime.bind("focus", function () {
WdatePicker({startDate: "%y-{%M}-%d", dateFmt: "yyyy-MM-dd", autoPickDate: false, maxDate: '%y-%M-{%d-1}'}); WdatePicker({startDate: "%y-{%M}-%d", dateFmt: "yyyy-MM-dd", autoPickDate: false, maxDate: '%y-%M-{%d}'});
}); });
startTime.bind("focus", function () { startTime.bind("focus", function () {
WdatePicker({ WdatePicker({
startDate: "%y-{%M}-%d", dateFmt: "yyyy-MM-dd", autoPickDate: false, maxDate: '%y-%M-{%d-1}', startDate: "%y-{%M}-%d", dateFmt: "yyyy-MM-dd", autoPickDate: false, maxDate: '%y-%M-{%d}',
onpicked: function () { onpicked: function () {
WdatePicker({ WdatePicker({
/* doubleCalendar: true, */ /* doubleCalendar: true, */
dateFmt: "yyyy-MM-dd", dateFmt: "yyyy-MM-dd",
autoPickDate: true, autoPickDate: true,
maxDate: '%y-%M-{%d-1}', maxDate: '%y-%M-{%d}',
el: 'endTime' el: 'endTime'
}) })
} }
......
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