Merge branch 'master-prod-new' into master-fwq组织架构优化

fwq

2024-01-26 afa194d8812f1995ad7fa2ce233d17b34e41bdf8

Merge branch 'master-prod-new' into master-fwq组织架构优化

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java

@@ -12,6 +12,8 @@
 */
@Data
public class CouponCheckDto {
    /**当前操作开单平台AppId*/
    private String appId;

    /**用户优惠券码标识集合*/
    private List<String> couponNumberIdList;

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

@@ -36,6 +36,8 @@
    private String loginEmpStr;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;
    /**是否查询复购数据,0否1是*/
    private Integer isSelectRepurchase = 0;

    public List<String> getShopIdList() {
        if(shopIdList == null){

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

@@ -24,7 +24,14 @@
    private String sleepTime;
    /**门店列表标识*/
    private List<String> shopIdList;

    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;
    /**是否统计现金业绩*/
    private Integer isCountCash = 0;
    /**员工标识列表*/
    private List<String> employeeIdList;
    /**统计类型*/
    private String countType;
    /**是否统计顾问数据*/
    private Integer isCountAdviser = 0;
}

 phis-feign/src/main/java/com/hz/his/dto/role/SysCommonRoleDto.java

New file
@@ -0,0 +1,23 @@
package com.hz.his.dto.role;

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

/**
 * @author Andru
 * 公用权限
 * */
@Data
@EqualsAndHashCode(callSuper = true)
public class SysCommonRoleDto extends PageDto {

    /**类型*/
    private Integer type;

    /**是否启用*/
    private Integer isUse;

    public SysCommonRoleDto() {
    }
}

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

@@ -106,4 +106,10 @@
    @PostMapping("/admin/export/employee/cycle/week/list/export")
    Result cycleWeekListExport(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 咨询师-三大项目执行数据
     */
    @PostMapping("/admin/export/employee/relation/project/list")
    Result relationProjectList(@RequestBody EmployeeReportDto employeeReportDto);

}

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

@@ -129,4 +129,16 @@
     */
    @PostMapping("/admin/consultant/report/project/loss/list/V2")
    Result projectLossListV2(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 三大项目执行数据
     */
    @PostMapping("/admin/consultant/report/relation/project/list")
    Result relationProjectList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约迟到数据
     */
    @PostMapping("/admin/consultant/report/appointment/arrive/late/detail/list")
    Result appointmentArriveLateList(@RequestBody EmployeeReportDto employeeReportDto);
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.report.AppointmentVisitVo;
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 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-rel-pro")
public interface BiRelationProjectService {

    /**
     * 门店执行业绩数据
     */
    @PostMapping("/admin/project/relation/report/shop/list")
    Result deductionShopList(@RequestBody ShopReportDto shopReportDto);

    /**
     * 医生执行业绩数据
     */
    @PostMapping("/admin/project/relation/report/doctor/list")
    Result deductionDoctorList(@RequestBody ShopReportDto shopReportDto);

    /**
     * 产品部-执行业绩数据
     */
    @PostMapping("/admin/project/relation/report/department/cp/list")
    Result deductionCpList(@RequestBody ShopReportDto shopReportDto);

    /**
     * 再生部-执行业绩数据
     */
    @PostMapping("/admin/project/relation/report/department/zs/list")
    Result deductionZsList(@RequestBody ShopReportDto shopReportDto);

    /**
     * 再生部-渗透业绩数据
     */
    @PostMapping("/admin/project/relation/report/department/zs/permeate/list")
    Result deductionZsPermeateList(@RequestBody ShopReportDto shopReportDto);

    /**
     * 增长部-医生私域群数据-渗透业绩
     */
    @PostMapping("/admin/group/report/zs/doctor/list")
    Result deductionZsDoctorList(@RequestBody ShopReportDto shopReportDto);


}

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

@@ -56,4 +56,10 @@
    @PostMapping("/admin/user/deduction/report/shop/emp/list")
    Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 门店-三大项目执行数据
     */
    @PostMapping("/admin/export/shop/relation/project/list/day")
    Result relationProjectList(@RequestBody ShopReportDto shopReportDto);

}

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

@@ -99,5 +99,8 @@
    @PostMapping("/admin/export/shop/room/list")
    Result roomList(@RequestBody ShopReportDto shopReportDto);

    /**门店-三大项目执行数据*/
    @PostMapping("/admin/export/shop/relation/project/list/sale")
    Result relationProjectList(@RequestBody ShopReportDto shopReportDto);

}