Commit 93d3b1fa authored by 王鹿鹿's avatar 王鹿鹿

任务 8137

parent 9a73e593
......@@ -1186,7 +1186,7 @@ public class TopographyController extends AbstractBaseController {
Date dDate = DateUtils.getCurrentMonthEndTime(DateUtils.dateParse(DateUtils.dateToStringY(beginDate) + "-" + i,DateUtils.MONTH_PATTERN));
for (String dat : dates) {
if (DateUtils.belongCalendar(dateParse(dat), bDate, dDate)) {
if ("True".equals(timeAndValue.get(dat))) {
if ("true".equals(timeAndValue.get(dat))) {
num++;
}
}
......@@ -1232,7 +1232,7 @@ public class TopographyController extends AbstractBaseController {
for (String dat : dates) {
if (DateUtils.belongCalendar(dateParse(dat), bDate, dDate)) {
if ("True".equals(timeAndValue.get(dat))) {
if ("true".equals(timeAndValue.get(dat))) {
num++;
}
}
......@@ -1282,13 +1282,13 @@ public class TopographyController extends AbstractBaseController {
if (i == datesFinal.size() - 1) {
if (DateUtils.belongCalendar(dateParse(dat), datesFinal.get(i),
DateUtils.getCurrentDayEndTime(datesFinal.get(i)))) {
if ("True".equals(timeAndValue.get(dat))) {
if ("true".equals(timeAndValue.get(dat))) {
num++;
}
}
} else {
if (DateUtils.belongCalendar(dateParse(dat), datesFinal.get(i), datesFinal.get(i + 1))) {
if ("True".equals(timeAndValue.get(dat))) {
if ("true".equals(timeAndValue.get(dat))) {
num++;
}
}
......
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