From 046dc12bf491f186ec96450aa5331c25f6e0fe54 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期四, 16 十一月 2023 11:26:44 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java | 4 ++--
phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java | 5 ++++-
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 8 +++++++-
phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java | 11 +++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 6 ++++++
5 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
index c470b2c..0f0a37c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
@@ -23,6 +23,12 @@
private Integer isPerformanceEmp;
/**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
private List<String> roleList;
- /**绫诲瀷*/
+
+
+ /**鏌ヨ绫诲瀷*/
private Integer type;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
index dd2365a..fc5862b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
@@ -48,6 +48,9 @@
//娆¤璇夋眰
private String minorAppeal;
+ //鑱屼笟
+ private String professionName;
+
public String getUserId() {
return userId;
@@ -216,4 +219,12 @@
public void setMinorAppeal(String minorAppeal) {
this.minorAppeal = minorAppeal;
}
+
+ public String getProfessionName() {
+ return professionName;
+ }
+
+ public void setProfessionName(String professionName) {
+ this.professionName = professionName;
+ }
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
index 0efd929..3ebb4ca 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
@@ -89,6 +89,12 @@
Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);
/**
+ * 鍜ㄨ甯�-鑰佸甫鏂颁笟缁╂帓鍚嶇涓�鐨勫憳宸�
+ */
+ @PostMapping("/admin/export/employee/oldNew/top/employee")
+ Result oldNewReportTopEmployee(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
* 鍜ㄨ甯�-棰勭害鍛ㄦ湡鎶ヨ〃
*/
@PostMapping("/admin/export/employee/cycle/week/list")
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
index 2ec5658..be7c7d5 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
@@ -12,6 +12,8 @@
private Integer pageNum;
/**褰撳墠椤垫樉绀烘潯鏁�*/
private Integer pageSize;
+ /**鍏抽敭瀛�*/
+ private String keyWord;
/**瀵规瘮鐓ф爣璇�*/
private String id;
@@ -24,8 +26,6 @@
/**鐢ㄦ埛闋呯洰鏍囪瘑*/
private String userProjectItemId;
-
-
public Integer getPageNum() {
if(pageNum == null){
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java
index 21d9135..00171f8 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java
@@ -46,7 +46,10 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date lastEndTime;
-
+ /**鏄惁鍙敤澧炲�奸噾缁撹处*/
+ private Integer useIncrement;
+ /**鏄惁鍙敤浼樻儬鍒哥粨璐�*/
+ private Integer useCoupon;
/**绫诲瀷-鍗￠」*/
public static final Integer LIMIT_CARD_ITEM = 0;
/**绫诲瀷-淇冮攢*/
--
Gitblit v1.8.0