Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

wangrenhuang

2023-11-15 6d2385e7e53d0d48f6d4c484042c29e977f4ab01

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java

@@ -23,6 +23,12 @@
    private Integer isPerformanceEmp;
    /**员工角色唯一标识数组*/
    private List<String> roleList;
    /**类型*/


    /**查询类型*/
    private Integer type;
    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;
}

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

@@ -89,6 +89,12 @@
    Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 咨询师-老带新业绩排名第一的员工
     */
    @PostMapping("/admin/export/employee/oldNew/top/employee")
    Result oldNewReportTopEmployee(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 咨询师-预约周期报表
     */
    @PostMapping("/admin/export/employee/cycle/week/list")