|
|
|
@ -48,7 +48,7 @@ public class DdlPreparedPack {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate);
|
|
|
|
|
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, endDate);
|
|
|
|
|
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, endDate);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -91,15 +91,15 @@ public class DdlPreparedPack {
|
|
|
|
|
time[1] += " 23:59:59";
|
|
|
|
|
}
|
|
|
|
|
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, time[0]);
|
|
|
|
|
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, time[1]);
|
|
|
|
|
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, time[1]);
|
|
|
|
|
} else {
|
|
|
|
|
if (showTaday) {
|
|
|
|
|
if (isShowTime) {
|
|
|
|
|
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
|
|
|
|
|
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, today + " 23:59:59");
|
|
|
|
|
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_"+ columnName, today + " 23:59:59");
|
|
|
|
|
} else {
|
|
|
|
|
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today);
|
|
|
|
|
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, today);
|
|
|
|
|
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_" + columnName, today);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|