From d9941dab703ba76b0cae50834ae6e35c19cef329 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 16 五月 2023 14:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java | 12 +++++++++++-
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 +++++++
5 files changed, 33 insertions(+), 1 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/dto/user/money/UserMoneyDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
index d70d3bb..dc59145 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
@@ -12,6 +12,11 @@
@Data
@ToString
public class UserMoneyDto {
+
+ /**褰撳墠椤垫暟*/
+ private Integer pageNum;
+ /**褰撳墠椤垫樉绀烘潯鏁�*/
+ private Integer pageSize;
/**
* 鎿嶄綔浜虹被鍨�
*/
@@ -28,7 +33,10 @@
* 鎿嶄綔澶囨敞
*/
private String remarks;
-
+ /**
+ * 绫诲瀷(鏌ヨ绫诲瀷)
+ */
+ private Integer type;
/**
* 璁板綍绫诲瀷
*/
@@ -110,6 +118,8 @@
/*鏄惁闇�瑕侀鍙� 0 鍚� 1 鏄� 榛樿闇�瑕侀鍙�*/
private Integer isReceiveValueAddedFund;
+ /**鏄惁棰嗗缓璧勯噾璁板綍 0 鍚� 1 鏄�*/
+ private Integer isHisRecord;
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
/**
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
index d601adf..2453e21 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
@@ -1,5 +1,6 @@
package com.hz.his.feign.service.platform;
+import com.alibaba.fastjson.JSONObject;
import com.hx.resultTool.Result;
import com.hz.his.dto.user.money.UserMoneyDto;
import org.springframework.cloud.openfeign.FeignClient;
@@ -49,4 +50,10 @@
* */
@PostMapping(value = "/user/money/unclaimed/default/setting")
Result userDefaultSetting(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
+ * 鐢ㄦ埛璧勯噾浣跨敤璁板綍鍒楄〃
+ * */
+ @PostMapping(value = "/user/money/use/log/list")
+ Result useLogListData(@RequestBody UserMoneyDto userMoneyDto);
}
\ No newline at end of file
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