From b658ee26a04562efce6917c86b96bd910dd23765 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期日, 25 六月 2023 14:58:56 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java | 74 ++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java | 60 ++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java | 8 ++
3 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
new file mode 100644
index 0000000..1368964
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
@@ -0,0 +1,74 @@
+package com.hz.his.dto.employee;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Table;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Unique;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 鍛樺伐
+ * author:fhx
+ * Date:2021/8/4 17:35
+ */
+
+@Data
+public class EmployeeVo {
+
+ private String unionId;
+
+ private String userId;
+
+ private String cnName;
+
+ private String enName;
+
+ private String tel;
+
+ private String email;
+
+ private String imgUrl;
+
+ private String apiId;
+
+ private Integer isJob;
+
+ private Integer gender ;
+
+ private String employeeNo;
+
+ private String roleId;
+
+ private Integer isSyncRole;
+ private String idCard;
+ private String birthday;
+ private String degree;
+ private String certificateNo;
+ private String password;
+ private Integer isPerformanceEmp;
+ private String cardId;
+
+ //sql璇彞杩斿洖浣跨敤瀛楁
+ private String shopId;
+ private String shopName;
+ private String shopHisId;
+ private String roleName;
+ private String roleStr;
+ private String roleTypeId;
+ private String adminRoleId;
+ //鐧诲綍瑙掕壊id
+ private String loginRoleId;
+
+ // 鍏宠仈鍚庡彴绠＄悊鍛榠d
+ private String adminId;
+ private String adminName;
+
+ public EmployeeVo() {
+ }
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java b/phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java
new file mode 100644
index 0000000..167c2c0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java
@@ -0,0 +1,60 @@
+package com.hz.his.dto.shop;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+/**
+ * 闂ㄥ簵
+ */
+@Data
+public class ShopVo {
+
+ private String id;
+ private String code;
+
+ private String name;
+
+ private String institutionalCode;
+
+ private String departmentId;
+
+ private Integer corpMpDepId;
+
+ private Integer maxAppNum;
+
+ private Integer maxSwitchNum;
+
+ private Integer isUp;
+
+ private String workTime;
+
+ private String province;
+
+ private String city;
+
+ private String area;
+
+ private String addr;
+
+ private String colorStr;
+
+ private String doctorRelaxTime;
+
+ private String carWay;
+
+ private String subWay;
+
+ private String apiId;
+ private Integer shengMeiNum;
+ private Integer sameTimeCustomerNum;
+
+ private String clinicCode;
+ private String clinicName;
+
+ private Integer isPerformanceShop;
+
+ public ShopVo() {
+ }
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
index 4321960..12a8d34 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
@@ -36,4 +36,12 @@
*/
@PostMapping(value = "/shop/list")
Result getList(@RequestBody TimeDto timeDto);
+
+
+ /**
+ * 鑾峰彇闂ㄥ簵璇︽儏杩斿洖vo
+ * @return Result
+ */
+ @PostMapping(value = "/shop/detail/vo")
+ Result getShopDetailVo(@RequestBody ShopDto shopDto);
}
--
Gitblit v1.8.0