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

fwq

2024-02-19 afd79c1be92164bddf2996e4d0eac5e7d712bf64

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

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

New file
@@ -0,0 +1,36 @@
package com.hz.his.dto.employee;

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

import java.util.List;

/**
 * @author fwq
 * 员工-用户开发计划
 * */
@Data
public class EmpUserPlanDto extends PageDto {
    /**用户标识*/
    private String userId;

    /**开发周期开始时间*/
    private String cycleStartTime;
    /**开发周期结束时间*/
    private String cycleEndTime;

    /**项目信息搜索*/
    private String projectData;
    /**用户信息搜索*/
    private String userData;
    /**顾问搜索*/
    private String empData;

    /**员工标识*/
    private List<String> employeeIdList;
    /**门店标识*/
    private List<String> shopIdList;
    /**标识*/
    private List<String> idList;

}

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

@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.employee.EmpUserPlanDto;
import com.hz.his.dto.report.EmployeeReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,4 +28,16 @@
    Result analyseListOne(@RequestBody EmployeeReportDto employeeReportDto);


    /**
     * 查看客户开发计划
     */
    @PostMapping("/admin/employee/user/plan/list")
    Result employeeUserPlanList(@RequestBody EmpUserPlanDto empUserPlanDto);

    /**
     * 查看要通知的开发计划完成度
     */
    @PostMapping("/admin/employee/user/plan/list/rate")
    Result employeeUserPlanRate(@RequestBody EmpUserPlanDto empUserPlanDto);

}