Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-08-21 c4dd23bd31f954d0132e995018c4f528f37ffa92

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java

@@ -14,6 +14,7 @@
    private String employeeId;
    /**门店标识*/
    private String shopId;
    /**门店标识集合*/
    private String shopIds;
    /**登录员工唯一字符串*/
    private String roleStr;
@@ -35,4 +36,7 @@
    private Integer isBothOne;
    /**工作日*/
    private Integer workDayNum;
    /**操作人*/
    private String operatorId;
    private String operatorName;
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java

New file
@@ -0,0 +1,42 @@
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-arrive-report")
public interface BiArriveReportService {

    /**
     * 预约到访分析-门店数据
     */
    @PostMapping("/report/arrive/shop/list")
    Result shopDataList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约到访分析-咨询师
     */
    @PostMapping("/report/arrive/employee/list")
    Result empDataList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约到访分析-门店数据-导出
     */
    @PostMapping("/report/arrive/shop/list/export")
    Result shopDataListExport(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约到访分析-咨询师-导出
     */
    @PostMapping("/report/arrive/employee/list/export")
    Result empDataListExport(@RequestBody EmployeeReportDto employeeReportDto);


}