Merge branch 'master' into master-test

wangrenhuang

2023-10-23 85d1dc328bd46089b63b57bd356908cbba26e29c

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
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;
import org.springframework.web.bind.annotation.RequestMapping;


/**
@@ -17,32 +17,43 @@

    /**
     * 日报表-当日到店信息
     * ArriveShopVo
     */
    @PostMapping("/admin/export/shop/day/arriveShop")
    Result arriveShop(@RequestBody ShopReportDto shopReportDto);

    /**
     * 日报表-当日各业绩指标
     * ShopAchievementVo
     */
    @PostMapping("/admin/export/shop/day/indicators")
    Result indicators(@RequestBody ShopReportDto shopReportDto);

    /**
     * 新老会员数据
     * ShopOldLeadNewVo
     */
    @PostMapping("/admin/export/shop/day/old/lead/new")
    Result oldLeadNew(@RequestBody ShopReportDto shopReportDto);

    /**
     * 重点项目指标数据
     * ShopImportantProjectVo
     */
    @PostMapping("/admin/export/shop/important/project/indicators/list")
    Result importantProjectIndicators(@RequestBody ShopReportDto shopReportDto);

    /**
     * 其它业绩信息
     * ShopOtherVo
     */
    @RequestMapping("/admin/export/shop/other/list")
    @PostMapping("/admin/export/shop/other/list")
    Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);

    /**
     * 门店-员工-用户执行业绩
     */
    @PostMapping("/admin/user/deduction/report/shop/emp/list")
    Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);

}