Merge branch 'master-prod-new' into master-test

ANDRU-PC\Andru

2023-09-25 4f446e75ce8adfa8e88efb81cdfb0ef495f19470

Merge branch 'master-prod-new' into master-test

 phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java

New file
@@ -0,0 +1,38 @@
package com.hz.his.dto.activityData;

import com.hz.his.dto.PageDto;
import lombok.Data;

/**
 * 升单报表dto
 * @USER: fhx
 * @DATE: 2023/9/25
 **/
@Data
public class ActivityReportDto extends PageDto {

    /** 报告id */
    private String reportId;
    /** 用户名 */
    private String name;
    /** 渠道 */
    private String channel;
    /** 渠道 */
    private String channelName;
    /** 渠道 */
    private String channelName2;
    /** 营销项目名称 */
    private String marketProjectName;
    /** 咨询师名称 */
    private String consultName;
    /** 医生名称 */
    private String doctorName;
    //开始时间
    private String startTime;
    //结束时间
    private String endTime;
    /** 操作人标识 */
    private String operatorId;
    /** 操作人 */
    private String operatorName;
}

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

New file
@@ -0,0 +1,22 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.activityData.ActivityReportDto;
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-activity-report")
public interface BiActivityReportService {

    /**
     * 客人到店准时分析报表
     */
    @PostMapping("/activity/report/export")
    Result storeAnalysis(@RequestBody ActivityReportDto activityReportDto);
}