From dce20bc3e1d912f75d977acafba98e1eaf19cc9a Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 20 十月 2022 18:43:23 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleItem.java | 30 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleDto.java | 23 +++++++
phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java | 10 ++-
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeScheduleService.java | 30 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java | 51 +++++++++++++++++
5 files changed, 141 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java
new file mode 100644
index 0000000..ac73be5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java
@@ -0,0 +1,51 @@
+package com.hz.his.dto.employee;
+
+import lombok.Data;
+
+/**
+ * 宸ヤ綔浜哄憳鎺掔彮鏁版嵁
+ */
+@Data
+public class EmployeeSchedule {
+
+
+ private String shopId;
+
+ private String shopName;
+
+
+ private String employeeId;
+
+ private String employeeName;
+
+ private String employeeImgUrl;
+
+
+ private String dayTime;
+
+
+ private String monthTime;
+
+ private String uniqueStr;
+
+ private String operatorId;
+
+ private String operatorName;
+
+ private Integer operatorType;
+
+ private String remark;
+
+ public EmployeeSchedule() {
+
+ }
+
+ /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
+ public static Integer OPERATOR_TYPE_ADMIN = 0;
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static Integer OPERATOR_TYPE_EMPLOYEE = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
+ public static Integer OPERATOR_TYPE_USER = 2;
+ /**鎿嶄綔浜虹被鍨�-绯荤粺*/
+ public static Integer OPERATOR_TYPE_SYSTEM = 3;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleDto.java
new file mode 100644
index 0000000..d1c0de7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleDto.java
@@ -0,0 +1,23 @@
+package com.hz.his.dto.employee;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍛樺伐鎺掔彮dtp
+ * @author Andru
+ */
+@Data
+public class EmployeeScheduleDto {
+
+ /** 鍛樺伐鎺掔彮瀵硅薄 */
+ private EmployeeSchedule employeeSchedule;
+
+ /** 鎺掔彮鏃堕棿鏁版嵁鍒楄〃 */
+ private List<EmployeeScheduleItem> employeeScheduleItemList;
+
+ public EmployeeScheduleDto() {
+
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleItem.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleItem.java
new file mode 100644
index 0000000..63d8166
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleItem.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.employee;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 宸ヤ綔浜哄憳鎺掔彮鏁版嵁瀛愰」鏁版嵁
+ */
+@Data
+
+public class EmployeeScheduleItem {
+
+
+ private String employeeScheduleId;
+
+
+ private String dayTime;
+
+ private Integer intervalTime ;
+
+ private Date startTime;
+
+
+ private Date endTime;
+
+ public EmployeeScheduleItem() {
+
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java
index de435b2..0788277 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java
@@ -3,7 +3,6 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
-import java.util.Date;
import java.util.List;
/**
@@ -22,9 +21,9 @@
/*鐢ㄦ埛鍚嶇О*/
private String userName;
/*棰勭害寮�濮嬫椂闂�*/
- private Date startTime;
+ private String startTime;
/*棰勭害缁撴潫鏃堕棿*/
- private Date endTime;
+ private String endTime;
/*闂ㄥ簵Id*/
private String shopId;
/*闂ㄥ簵鍚嶇О*/
@@ -51,6 +50,11 @@
private String platSourceName;
/*鏄惁SPA(0:鍚�,1:鏄�)*/
private Integer isSpa;
+ /*澶囨敞*/
+ private String remarks;
+ /*鐘舵�� 0锛氬緟鍒板簵锛�1锛氬彇娑堥绾︼紱2锛氬凡鍒板簵锛�3锛氶绾﹀畬鎴�*/
+ private Integer status;
+
//棰勭害椤圭洰
List<PreOrderItemDto> preOrderItems;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeScheduleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeScheduleService.java
new file mode 100644
index 0000000..06ed928
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeScheduleService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.employee.EmployeeScheduleDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-employeeSchedule")
+public interface SPhipEmployeeScheduleService {
+
+ /**
+ * 鍛樺伐鎺掔彮鍒楄〃
+ */
+ @PostMapping(value = "/employee/schedule/list")
+ Result list(@RequestBody EmployeeScheduleDto employeeScheduleDto);
+
+
+
+ /**
+ * 鍛樺伐鎺掔彮鏃堕棿淇℃伅
+ */
+ @PostMapping(value = "/employee/schedule/info")
+ Result info(@RequestBody EmployeeScheduleDto employeeScheduleDto);
+
+
+}
\ No newline at end of file
--
Gitblit v1.8.0