From 4c9f508b53662ca8280a92f128250de1dc5dd570 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 16 五月 2023 10:17:29 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 2 ++
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java | 7 +++++++
3 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index 5f34e81..928ce41 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -26,4 +26,6 @@
private String startTime;
/**缁撴潫鏃堕棿*/
private String endTime;
+ /**绫诲瀷*/
+ private Integer type;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
index a82dc30..4f2b120 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
import com.hz.his.dto.report.ShopReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -49,4 +50,10 @@
@PostMapping("/admin/export/shop/other/list")
Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 闂ㄥ簵-鍛樺伐-鐢ㄦ埛鎵ц涓氱哗
+ */
+ @PostMapping("/admin/user/deduction/report/shop/emp/list")
+ Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index 6105e46..294caa5 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -1,5 +1,7 @@
package com.hz.phis.dt.user;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.math.BigDecimal;
@@ -71,5 +73,9 @@
private String imgUrl;
private String hisId;
private String userBelongingType;
+ //鐢电綉鍜ㄨ椤鹃棶(TMK) (Employee id)
+ private String internetCorpUserId;
+ //鎵�灞炴姢澹�
+ private String nurseCorpUserId;
}
--
Gitblit v1.8.0