diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java index 3de28d8..607427d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java @@ -162,7 +162,7 @@ public class BsonPackTool { * @param isShowTime 是否包含时分秒 */ public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showToday,boolean isShowTime) { - if(date != null && date.trim().length() > 0){ + if(date != null && !"null".equals(date) && date.trim().length() > 0){ date = getSafeParam(date); String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index 0aa94fb..59f7c19 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; import com.mongodb.BasicDBObject; import org.bson.conversions.Bson; @@ -66,4 +67,19 @@ public class CoreBsonPack { return bson; } + + /** + * 定时任务日志复杂查询 + * @param sysLogTaskTime + * @return + */ + public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime){ + Bson bson = new BasicDBObject(); + + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(),"name",bson); + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(),"groupName",bson); + bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(),"createDatetime",bson,false,false); + + return bson; + } }