调整作息

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysWorkTime.java

@@ -125,6 +125,7 @@ public class SysWorkTime extends BaseEntity {
      * 机构
      */
     @ApiModelProperty(value = "机构")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -222,7 +222,7 @@ public class SysUserController extends BaseController {
             return error("新增用户'" + user.getUsername() + "'失败，手机号码已存在");
         }
         user.setCreateBy(SecurityUtils.getUsername());
-        user.setSource(3);
+        user.setSource(0);
         user.setCreateTime(new Date());
         //isp的加密方式
         final String salt = SaltHelper.salt();

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysWorkTimeSetController.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
 import java.util.Calendar;
 
 /**
@@ -45,7 +46,7 @@ public class SysWorkTimeSetController extends BaseController {
     @ApiOperation(value = "find查询SysWorkTimeSet列表")
     @RequiresPermissions("system:set:find")
     @GetMapping("/find")
-    public AjaxResult find(SysWorkTimeSet sysWorkTimeSet) {
+    public AjaxResult find(SysWorkTimeSet sysWorkTimeSet) throws ParseException {
 
         return sysWorkTimeSetService.workTimePageList(sysWorkTimeSet);
     }

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

@@ -5,6 +5,7 @@ import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.system.domain.SysWorkTimeSet;
 
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -72,5 +73,5 @@ public interface ISysWorkTimeSetService extends IService<SysWorkTimeSet> {
      */
     TableDataInfo selectPage(SysWorkTimeSet sysWorkTimeSet);
 
-    AjaxResult workTimePageList(SysWorkTimeSet sysWorkTimeSet);
+    AjaxResult workTimePageList(SysWorkTimeSet sysWorkTimeSet) throws ParseException;
 }

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

@@ -1,5 +1,7 @@
 package com.xunmei.system.service.impl;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import cn.hutool.core.date.DateField;
@@ -80,9 +82,23 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
     }
+    public static Date parseDate(String dateString, String dateFormat) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        return sdf.parse(dateString);
+    }
 
+    public static Date extractDate(String dateString, String dateFormat) throws ParseException {
+        Date date = parseDate(dateString, dateFormat);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return calendar.getTime();
+    }
     @Override
-    public AjaxResult workTimePageList(SysWorkTimeSet sysWorkTimeSet) {
+    public AjaxResult workTimePageList(SysWorkTimeSet sysWorkTimeSet) throws ParseException {
 
 
         //未删除
@@ -108,7 +124,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
                 ("effective_date");
         //时间范围查询
         if (sysWorkTimeSet.getParams().get("beginTime") != null && sysWorkTimeSet.getParams().get("endTime") != null) {
-            query.between("effective_date", sysWorkTimeSet.getParams().get("beginTime"), sysWorkTimeSet.getParams().get("endTime"));
+            query.between("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"));
         }
         //获取数据
         page = sysWorkTimeSetMapper.selectPage(page, query);