From baf3e35721a6d6154e6bed809240c26c5c3b27dc Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 17 四月 2023 11:11:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java | 35 +++
phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java | 82 +++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java | 15 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java | 36 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 85 +++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 82 +++++++
phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java | 21 +
phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java | 55 +++++
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 23 ++
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 29 ++
phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java | 25 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java | 52 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 86 +++++++
13 files changed, 626 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java
new file mode 100644
index 0000000..bdf041e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java
@@ -0,0 +1,82 @@
+package com.hz.his.dto.report;
+
+
+import lombok.Data;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class ConsultantCashDto{
+
+ private String userId;
+
+ private String userName;
+
+ private String tel;
+
+ private String CIQ;
+
+ private String memberNO;
+
+ private String userType;
+
+ private String channelId;
+
+ private String channelName;
+
+ private String channel2Id;
+
+ private String channelName2;
+
+ private String channelCategory;
+
+ private String arrivalType;
+
+ private String orderNo;
+ private String type;
+ private String orderId;
+ private String developerShopId;
+ private String developerShopName;
+ private String cashierShopId;
+ private String cashierShopName;
+ private String serviceShopId;
+ private String serviceShopName;
+ private String operatorId;
+ private String operatorName;
+ private Date orderTime;
+ private String orderConsultantId;
+ private String orderConsultantName;
+ private String cashierId;
+ private String cashierName;
+ private String developerId;
+ private String developerName;
+ private String goodsType;
+ private String itemTypeId1;
+ private String itemTypeName1;
+ private String itemTypeId2;
+ private String itemTypeName2;
+ private String itemTypeId3;
+ private String itemTypeName3;
+ private String goodsName;
+ private BigDecimal discount;
+ private String doctorQualification;
+ private String specification;
+ private String unit;
+ private String specs = "[]";
+ private BigDecimal proPrice=BigDecimal.ZERO;
+ private Integer buyNum;
+ private String transactionType;
+ private String payMode;
+ private Date payTime;
+ private String remarks;
+
+ private BigDecimal performanceMoney=BigDecimal.ZERO;
+
+ //鐢ㄦ埛鍜ㄨ甯堬紙鑽ｇ埛璇存潈闄愭寜鐓ц繖涓煡璇級
+ private String hisCorpUserName;
+
+ //浜ゆ槗绫诲瀷
+ public static final String TYPE_TRANSACTION_PROCEEDS="鏀舵";
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java
new file mode 100644
index 0000000..7f8ea9e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java
@@ -0,0 +1,55 @@
+package com.hz.his.dto.report;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鍜ㄨ甯堢幇閲戜笟缁╂姤琛�
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/12/22/10:35
+ * @Description:
+ */
+@Data
+public class ConsultantCashReportDto extends PageDto {
+ //寮�鍗曟椂闂达細寮�濮嬫椂闂�(鏍煎紡:yyyy-MM-dd)
+ private String startTime;
+ //寮�鍗曟椂闂达細缁撴潫鏃堕棿(鏍煎紡:yyyy-MM-dd)
+ private String endTime;
+ //闂ㄥ簵鏍囪瘑
+ private String shopId;
+ //鏀堕摱闂ㄥ簵
+ private String cashierShopId;
+ //鍏抽敭瀛楁煡璇�
+ private String keyWord;
+ //涓氬姟鍒嗙被('鏀舵','閫�娆�')
+ private String transactionType;
+ //钀ラ攢鍒嗙被(鍟嗗搧鍒嗙被,OrderItemConstants)
+ private String goodsType;
+ //璁㈠崟绫诲瀷(OrderTotalConstants)
+ private String type;
+ //璁㈠崟鍙�
+ private String orderNo;
+ //娓犻亾锛屾湯绾d
+ private String channel2Id;
+ //瀹㈡埛(濮撳悕銆乧iq銆佷細鍛樺彿銆佹墜鏈哄彿)
+ private String userName;
+ //瀹㈡埛绫诲埆
+ private String userType;
+ //椤圭洰鍒嗙被,鏈骇id
+ private String itemTypeId;
+ //鍟嗗搧鍚嶇О
+ private String goodsName;
+ //寮�鍗曞挩璇㈠笀锛堣崳鐖疯鏉冮檺鎸夌収杩欎釜鏌ヨ锛�
+ private String orderConsultantId;
+ //寮�鍗曞挩璇㈠笀锛堣崳鐖疯鏉冮檺鎸夌収杩欎釜鏌ヨ锛�
+ private String orderConsultantName;
+ //寮�鍗曞挩璇㈠笀锛堣崳鐖疯鏉冮檺鎸夌収杩欎釜鏌ヨ锛�
+ private ConsultantCashDto consultantCashReport;
+ //鐢ㄦ埛鍜ㄨ甯堬紙鑽ｇ埛璇存潈闄愭寜鐓ц繖涓煡璇級
+ private String hisCorpUserName;
+ //鐢ㄦ埛鍜ㄨ甯堬紙鑽ｇ埛璇存潈闄愭寜鐓ц繖涓煡璇級
+ private String hisCorpUserId;
+ //鐧诲綍鍛樺伐鏍囪瘑
+ private String loginEmpId;
+}
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
new file mode 100644
index 0000000..5f34e81
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -0,0 +1,29 @@
+package com.hz.his.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * @author fwq
+ * */
+@Data
+public class EmployeeReportDto {
+ /**鍛樺伐鏍囪瘑*/
+ private String employeeId;
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
+ private String roleStr;
+ /**鍛樺伐鏍囪瘑闆嗗悎*/
+ private List<String> employeeIdList;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
+ private List<String> shopIdList;
+ /**褰撳墠鏃堕棿*/
+ private String nowTime;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
new file mode 100644
index 0000000..39bea7a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
@@ -0,0 +1,23 @@
+package com.hz.his.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 闂ㄥ簵鎶ヨ〃鎵╁睍
+ * @author fwq
+ * */
+@Data
+public class ShopReportDto {
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**褰撳墠鏃堕棿*/
+ private String nowTime;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+ /**闂ㄥ簵鍒楄〃鏍囪瘑*/
+ private List<String> shopIdList;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
new file mode 100644
index 0000000..8090bbb
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.report;
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * @author fwq
+ * */
+@Data
+public class UserReleaseDto extends PageDto {
+ /**鍛樺伐鏍囪瘑*/
+ private String employeeId;
+ /**褰撳墠鏃堕棿*/
+ private String nowTime;
+ /**椤堕儴鍜ㄨ甯堝垪琛�*/
+ private List<String> topEmployeeIdList;
+ /**鍜ㄨ甯堝垪琛�*/
+ private List<String> employeeIdList;
+ /**绛夌骇鍒楄〃*/
+ private List<String> memberLevelList;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java
new file mode 100644
index 0000000..1b090b0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java
@@ -0,0 +1,36 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.ConsultantCashReportDto;
+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 = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-consultant-cash")
+public interface BiConsultantCashService {
+
+ /**
+ * 鏂帮紝閫氳繃sql鏌ヨ
+ *
+ * @param dto
+ * @return
+ */
+ @PostMapping("/report/consultant/cash/list")
+ Result newList(@RequestBody ConsultantCashReportDto dto);
+
+ /**
+ * 鏂帮紝鏌ョ湅鍜ㄨ甯堢幇閲戜笟缁╂眹鎬绘姤琛ㄧ鐞�
+ *
+ * @param dto
+ * @return
+ */
+ @PostMapping("/report/consultant/cash/total/list")
+ Result totalList(@RequestBody ConsultantCashReportDto dto);
+
+
+}
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
new file mode 100644
index 0000000..624e212
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
@@ -0,0 +1,85 @@
+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.UserReleaseDto;
+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="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-day")
+public interface BiConsultantDayService {
+
+ /**
+ * 鍜ㄨ甯�-鍚勪笟缁╂寚鏍囨暟鎹�
+ * EmployeeAchievementVo
+ */
+ @PostMapping("/admin/export/employee/indicators/list")
+ Result indicators(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-鍒濊瘖鎯呭喌
+ * EmployeeFirstTreatVo
+ */
+ @PostMapping("/admin/export/employee/first/treat/list")
+ Result firstTreat(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鍜ㄨ甯�-鍒拌鏈垚浜ゅ悕鍗�
+ *
+ */
+ @PostMapping("/admin/export/employee/first/treat/user/list")
+ Result firstTreatUser(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鍜ㄨ甯�-鏍稿績椤圭洰鎸囨爣鏁版嵁
+ */
+ @PostMapping("/admin/export/employee/core/project/list")
+ Result coreProject(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鍜ㄨ甯�-鍏捣閲婃斁鍚嶅崟
+ */
+ @PostMapping("/admin/export/employee/user/release/list")
+ Result userReleaseList(@RequestBody UserReleaseDto userReleaseDto);
+
+ /**
+ * 鍜ㄨ甯�-娴佸け瀹㈡埛鍒楄〃
+ */
+ @PostMapping("/admin/export/employee/user/lose/list")
+ Result userLoseList(@RequestBody UserReleaseDto userReleaseDto);
+
+
+ /**
+ * 鍜ㄨ甯�-娌夌潯瀹㈡埛鍒楄〃
+ */
+ @PostMapping("/admin/export/employee/user/sleep/list")
+ Result userSleepList(@RequestBody UserReleaseDto userReleaseDto);
+
+ /**
+ * 鍜ㄨ甯�-娌夌潯瀹㈡埛姣斾緥
+ */
+ @PostMapping("/admin/export/employee/user/sleep/proportion")
+ Result userSleepProportion(@RequestBody UserReleaseDto userReleaseDto);
+
+ /**
+ * 鍜ㄨ甯�-浼氬憳绛夌骇鍒嗗竷鍒楄〃
+ */
+ @PostMapping("/admin/export/employee/user/member/distribution")
+ Result memberDistribution(@RequestBody UserReleaseDto userReleaseDto);
+
+ /**
+ * 鍜ㄨ甯�-浼氬憳绛夌骇鍒嗘瘮渚�
+ */
+ @PostMapping("/admin/export/employee/user/member/distribution/proportion")
+ Result memberDistributionProportion(@RequestBody UserReleaseDto userReleaseDto);
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
new file mode 100644
index 0000000..ef01088
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -0,0 +1,86 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
+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="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-sale")
+public interface BiConsultantSaleService {
+
+ /**
+ * 鍜ㄨ甯�-涓氱哗鎬诲垪琛�
+ */
+ @PostMapping("/admin/consultant/report/deduction/total/list")
+ Result deductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-鎵ц涓氱哗蹇姤
+ */
+ @PostMapping("/admin/consultant/report/deduction/detail/list")
+ Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鍜ㄨ甯�-鍒濊瘖绠�鎶�
+ */
+ @PostMapping("/admin/consultant/report/first/treat/list")
+ Result firstTreatList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-棰勭害鍒拌瘖
+ */
+ @PostMapping("/admin/consultant/report/appointment/arrive/list")
+ Result appointmentArriveList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鍜ㄨ甯�-鑰佸甫鏂扮畝鎶�
+ */
+ @PostMapping("/admin/consultant/report/old/new/list")
+ Result oldLeadNew(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-浼氬憳鍙樺姩鏁版嵁
+ */
+ @PostMapping("/admin/consultant/report/level/change/list")
+ Result levelChangeList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-瀛ｅ害娲昏穬瀹㈡埛
+ */
+ @PostMapping("/admin/consultant/report/active/user/list")
+ Result activeUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-娴佸け瀹㈡埛
+ */
+ @PostMapping("/admin/consultant/report/loss/user/list")
+ Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-鏍稿績椤圭洰
+ */
+ @PostMapping("/admin/consultant/report/core/project/list")
+ Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-娌夌潯瀹㈡墽琛屼笟缁�
+ */
+ @PostMapping("/admin/consultant/report/user/sleep/deduction/list")
+ Result userSleepDeductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-鍖荤敓鎵ц鍗犳瘮鏁版嵁鍒楄〃
+ */
+ @PostMapping("/admin/consultant/report/user/doctor/deduction/list")
+ Result userDoctorDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+}
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
new file mode 100644
index 0000000..a82dc30
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
@@ -0,0 +1,52 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.ShopReportDto;
+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="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-shop-day")
+public interface BiShopDayService {
+
+ /**
+ * 鏃ユ姤琛�-褰撴棩鍒板簵淇℃伅
+ * ArriveShopVo
+ */
+ @PostMapping("/admin/export/shop/day/arriveShop")
+ Result arriveShop(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 鏃ユ姤琛�-褰撴棩鍚勪笟缁╂寚鏍�
+ * ShopAchievementVo
+ */
+ @PostMapping("/admin/export/shop/day/indicators")
+ Result indicators(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 鏂拌�佷細鍛樻暟鎹�
+ * ShopOldLeadNewVo
+ */
+ @PostMapping("/admin/export/shop/day/old/lead/new")
+ Result oldLeadNew(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 閲嶇偣椤圭洰鎸囨爣鏁版嵁
+ * ShopImportantProjectVo
+ */
+ @PostMapping("/admin/export/shop/important/project/indicators/list")
+ Result importantProjectIndicators(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 鍏跺畠涓氱哗淇℃伅
+ * ShopOtherVo
+ */
+ @PostMapping("/admin/export/shop/other/list")
+ Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
new file mode 100644
index 0000000..a7f4043
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
@@ -0,0 +1,82 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.ShopReportDto;
+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="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-shop-sale")
+public interface BiShopSaleService {
+
+ /**
+ * 闂ㄥ簵-涓氱哗鎬诲垪琛�
+ */
+ @PostMapping("/admin/export/shop/deduction/total/list")
+ Result deductionList(ShopReportDto shopReportDto);
+
+ /**
+ * 闂ㄥ簵-鎵ц涓氱哗蹇姤
+ */
+ @PostMapping("/admin/export/shop/deduction/detail/list")
+ Result deductionDetailList(@RequestBody ShopReportDto shopReportDto);
+
+
+ /**
+ * 闂ㄥ簵-鍒濊瘖绠�鎶�
+ */
+ @PostMapping("/admin/export/shop/first/treat/list")
+ Result firstTreatList(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 闂ㄥ簵-棰勭害鍒拌瘖
+ */
+ @PostMapping("/admin/export/shop/appointment/arrive/list")
+ Result appointmentArriveList(@RequestBody ShopReportDto shopReportDto);
+
+
+ /**
+ * 闂ㄥ簵-鑰佸甫鏂扮畝鎶�
+ */
+ @PostMapping("/admin/export/shop/old/new/list")
+ Result oldLeadNew(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 闂ㄥ簵-浼氬憳鍙樺姩鏁版嵁
+ */
+ @PostMapping("/admin/export/shop/level/change/list")
+ Result levelChangeList(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 闂ㄥ簵-瀛ｅ害娲昏穬瀹㈡埛
+ */
+ @PostMapping("/admin/export/shop/active/user/list")
+ Result activeUserList(@RequestBody ShopReportDto shopReportDto);
+
+
+ /**
+ * 闂ㄥ簵-娴佸け瀹㈡埛
+ */
+ @PostMapping("/admin/export/shop/loss/user/list")
+ Result lossUserList(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 闂ㄥ簵-鏍稿績椤圭洰
+ */
+ @PostMapping("/admin/export/shop/core/project/list")
+ Result coreProjectList(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 闂ㄥ簵-娌夌潯瀹㈡墽琛屼笟缁�
+ */
+ @PostMapping("/admin/export/shop/user/sleep/deduction/list")
+ Result userSleepDeductionList(@RequestBody ShopReportDto shopReportDto);
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
index f347f17..2d77c81 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.activity.ActivityDto;
+import com.hz.phis.dt.reward.QuestionInvestigateDto;
import com.hz.phis.dt.reward.RewardRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,4 +28,18 @@
*/
@PostMapping(value = "/questionnaire/reward")
Result reward(RewardRecordDto recordDto);
+
+
+ /**
+ * 璋冩煡闂嵎璇︽儏
+ */
+ @PostMapping(value = "/questionnaire/investigate/details")
+ Result details(QuestionInvestigateDto questionInvestigateDto);
+
+ /**
+ * 鎻愪氦璋冩煡闂嵎
+ */
+ @PostMapping(value = "/questionnaire/submit")
+ Result submit(QuestionInvestigateDto questionInvestigateDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
new file mode 100644
index 0000000..b05332d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
@@ -0,0 +1,21 @@
+package com.hz.phis.dt.reward;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+/**
+ * @ClassName AwardDto
+ * @Description 璋冩煡闂嵎鎻愪氦鏁版嵁dto
+ * @Author wrh
+ * @Date 2023/4/17 10:46
+ * @Version 1.0
+ */
+@Data
+public class AnswerDto {
+
+ private String code;
+ private String titleId;
+ private String answer;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java
new file mode 100644
index 0000000..5eef97f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java
@@ -0,0 +1,35 @@
+package com.hz.phis.dt.reward;
+
+import com.hz.phis.dt.BaseDt;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName QuestionInvestigateDto
+ * @Description 璋冩煡闂嵎dto
+ * @Author wrh
+ * @Date 2023/4/17 10:39
+ * @Version 1.0
+ */
+@Data
+public class QuestionInvestigateDto extends BaseDt {
+
+ private String code;
+
+ private String investigateId;
+
+ private String userId;
+
+ private Integer type;
+
+ private Date startTime;
+
+ private Date doneTime;
+
+ private String proposal;
+
+ //绛旀鏁版嵁
+ private List<AnswerDto> answerDtoList;
+}
--
Gitblit v1.8.0