fhx
2023-08-18 e4cf174db3dc02713bb0af0788a02bacba6a89fc
Merge branch 'master-prod-new' into master-test
1个文件已添加
3个文件已修改
43 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
@@ -19,7 +19,10 @@
    /**门店标识*/
    private String shopId;
    /**门店标识集合*/
    private List<String> shopIdList;
    /**渠道大类渠道标识集合*/
    private List<String> channelList;
    /**开始时间*/
    private Date startTime;
    /**结束时间*/
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
@@ -88,4 +88,10 @@
    @PostMapping("/admin/export/employee/oldNew/report")
    Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-预约周期报表
     */
    @PostMapping("/admin/export/employee/cycle/week/list")
    Result cycleWeekList(@RequestBody EmployeeReportDto employeeReportDto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -116,5 +116,9 @@
    @PostMapping("/admin/consultant/report/room/list")
    Result roomList(@RequestBody EmployeeReportDto employeeReportDto);
    /**咨询师-咨询师-初诊成交率 */
    @PostMapping("/admin/consultant/report/first/user/rate/export")
    Result firstRateListExport(@RequestBody EmployeeReportDto employeeReportDto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java
New file
@@ -0,0 +1,30 @@
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 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀
 */
@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-source")
public interface BiConsultantSourceService {
    /*** 咨询师-评分列表 */
    @PostMapping("/admin/consultant/report/source/list")
    Result empSourceList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
    /*** 咨询师-评分列表-导出 */
    @PostMapping("/admin/consultant/report/emp/source/export")
    Result empSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
    /*** 咨询师-排名-导出 */
    @PostMapping("/admin/consultant/report/shop/emp/source/export")
    Result shopEmpSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
}