I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
crish 6 years ago
parent b422165082 e34a84274c
commit ff2fb39e0a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

18
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -47,8 +47,8 @@ public class DdlPreparedPack {
endDate += " 23:59:59";
}
packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, endDate);
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, endDate);
}
/**
@ -71,7 +71,7 @@ public class DdlPreparedPack {
String[] time = date.split(",");
if (time.length == 1) {
//只有开始日期，没有结束日期
packBean.addColumnQuery(columnName,"and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
} else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0)
|| (time[1] != null & time[1].trim().length() > 0))) {
if (time[0] == null || time[0].trim().length() == 0) {
@ -90,16 +90,16 @@ public class DdlPreparedPack {
if (isShowTime && time[1].trim().length() <= 11) {
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(columnName," and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + 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(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + 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(columnName," and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, today);
}
}
}

Write Preview
Loading…
Cancel
Save