From 904bd3f366c32dc5a8a6f092fe1fec192d40fac0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 06 Jan 2021 18:11:36 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java | 2
zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java | 21 ++++++++--
zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java | 63 +++++++++++++++++++++++++++++++
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 2
4 files changed, 82 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index 6e8f83a..e353f19 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -122,7 +122,7 @@
LogUtil.info("fileName : {}", fileName);
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
- ajaxResult.putInMap("file", fileName);
+ ajaxResult.putInMap("file", saveUrl + fileName);
return ajaxResult;
}
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..c82f43d
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java
@@ -0,0 +1,63 @@
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+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(String timeStr) {
+ //TODO app的用户获不能在session中，方案要改
+ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ return occupancyController.getCwzyList(timeStr,sysUsers.getShopId());
+ }
+
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java
index 1a3d742..b08b15a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java
@@ -12,6 +12,7 @@
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.service.SysWorkBeatuistaffService;
import com.matrix.system.hive.service.SysWorktimeService;
+import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,13 +52,19 @@
@RequestMapping(value = "/getKanban")
public @ResponseBody
AjaxResult showCwzyList(String timeStr) {
+ Long shopId = getMe().getShopId();
+ return getCwzyList(timeStr,shopId);
+ }
+
+ public AjaxResult getCwzyList(String timeStr,Long shopId){
+
if (timeStr == null || timeStr.equals("")) {
timeStr = DateUtil.dateToString(new Date(), "yyyy-MM-dd");
}
// 查询上班下班的最大时间段
Date currentDate = DateUtil.stringToDate(timeStr, DateUtil.DATE_FORMAT_DD);
// 把日期调整为当前查询日期
- Long shopId = 16L; //getMe().getShopId();
+
Date maxTime = worktimeService.findMaxTime(shopId);
//如果没有获取到门店的排班时间，无法查询占用情况
@@ -146,8 +153,7 @@
//计算表头的时间间隔
buildTimeSpan(startTime, maxTime, result);
-
- return result;
+ return result;
}
private void buildTimeSpan(Date startTime, Date maxTime, AjaxResult result) {
@@ -233,7 +239,7 @@
}
}
- class OccupancySPan {
+ public class OccupancySPan {
/**
* 休息
*/
@@ -247,12 +253,19 @@
*/
static final int WORKTYPE_OCCUPANCY = 3;
+ @ApiModelProperty(value = "色块长度")
Long spanLength;
+ @ApiModelProperty(value = "占用状态，1休息，2 上班，3 占用")
int workType;
+ @ApiModelProperty(value = "床位名称")
String bedName;
+ @ApiModelProperty(value = "项目名称")
String projName;
+ @ApiModelProperty(value = "会员名称")
String vipName;
+ @ApiModelProperty(value = "服务单id")
Long serviceId;
+ @ApiModelProperty(value = "服务单状态")
String serviceState;
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java b/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java
index ed3c363..bca8330 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java
@@ -74,7 +74,7 @@
BufferedOutputStream bos = null;
FileOutputStream fos = null;
File file = null;
- String filePathAndName = savePath + fileDir + File.separator + fileName;
+ String filePathAndName = fileDir + File.separator + fileName;
BASE64Decoder decoder = new BASE64Decoder();
byte[] bfile = new byte[0];
try {
--
Gitblit v1.9.1