解决 作息生效日期查询条件无效的缺陷

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTimeSet.java

@@ -56,7 +56,7 @@ public class SysWorkTimeSet extends BaseEntity {
     @ApiModelProperty(value = "机构 ID")
     private Long orgId;
     @TableField(exist = false)
-    private Date[] range;
+    private Date[] dateRange;
     /**
      * 机构 名称
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -153,8 +153,8 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
         query.orderByDesc
                 ("t.effective_date");
         //时间范围查询
-        if (sysWorkTimeSet.getParams().get("beginTime") != null && sysWorkTimeSet.getParams().get("endTime") != null) {
-            query.between("t.effective_date", extractDate(sysWorkTimeSet.getParams().get("beginTime").toString(), "yyyy-MM-dd HH:mm:ss"), extractDate(sysWorkTimeSet.getParams().get("endTime").toString(), "yyyy-MM-dd HH:mm:ss"));
+        if (sysWorkTimeSet.getDateRange() != null && sysWorkTimeSet.getDateRange().length==2) {
+            query.between("t.effective_date", DateUtil.beginOfDay(sysWorkTimeSet.getDateRange()[0]).toString("yyyy-MM-dd HH:mm:ss"), DateUtil.endOfDay(sysWorkTimeSet.getDateRange()[1]).toString("yyyy-MM-dd HH:mm:ss"));
         }
         //获取数据
         page = sysWorkTimeSetMapper.selectWorkTimeSetPage(page, query);