From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java b/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java
new file mode 100644
index 0000000..c4a5942
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java
@@ -0,0 +1,60 @@
+package com.matrix.system.app.action;
+
+import com.matrix.core.constance.MatrixConstance;
+import com.matrix.core.pojo.AjaxResult;
+import com.matrix.core.tools.DateUtil;
+import com.matrix.core.tools.WebUtil;
+import com.matrix.system.app.vo.StoreListVo;
+import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.service.SysUsersService;
+import com.matrix.system.constance.Dictionary;
+import com.matrix.system.hive.action.BaseController;
+import com.matrix.system.hive.action.OccupancyController;
+import com.matrix.system.hive.bean.SysBeauticianState;
+import com.matrix.system.hive.bean.SysWorkBeatuistaff;
+import com.matrix.system.hive.dao.SysBeauticianStateDao;
+import com.matrix.system.hive.plugin.util.CollectionUtils;
+import com.matrix.system.hive.service.SysWorkBeatuistaffService;
+import com.matrix.system.hive.service.SysWorktimeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @author jiangyouyao
+ * @date 2016-12-24
+ * @description 占用Controller
+ */
+@Api(value = "AppOccupancyController", tags = "员工预约情况")
+@RestController
+@RequestMapping(value = "/api/occupancy")
+public class AppOccupancyController extends BaseController {
+
+    @Resource
+    private OccupancyController occupancyController;
+
+    /**
+     * 获取员工预约情况
+     */
+    @ApiOperation(value = "获取员工预约情况", notes = "获取员工预约情况,示例参数:2021-01-06")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "ok", response = OccupancyController.OccupancySPan.class)
+    })
+    @GetMapping(value = "/getKanban/{timeStr}")
+    AjaxResult showCwzyList(@PathVariable String timeStr) {
+        //TODO app的用户获不能在session中,方案要改
+        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+        return occupancyController.getCwzyList(timeStr,sysUsers.getShopId());
+    }
+
+}

--
Gitblit v1.9.1