Merge branch 'master-prod-new' into fhx-prod-订单升单

fhx

2023-08-24 e09e3c40e9acf5bac969c829a942d6c1e532a895

Merge branch 'master-prod-new' into fhx-prod-订单升单

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

@@ -18,12 +18,12 @@
    Result empSourceList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);

    /*** 咨询师-评分列表-导出 */
    @PostMapping("/admin/consultant/report/emp/source/export")
    @PostMapping("/admin/consultant/report/source/emp/source/export")
    Result empSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);


    /*** 咨询师-排名-导出 */
    @PostMapping("/admin/consultant/report/shop/emp/source/export")
    @PostMapping("/admin/consultant/report/source/shop/emp/source/export")
    Result shopEmpSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);



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

@@ -82,6 +82,12 @@
    @PostMapping("/admin/operational/channels/deal")
    Result channelsDeal(@RequestBody OperationalStatementsVo operationalStatementsVo);

    /**
     * 各渠道首天成交情况分析-渠道总信息-导出
     */
    @PostMapping("/admin/operational/channels/deal/export")
    Result channelsDealExport(@RequestBody OperationalStatementsVo operationalStatementsVo);


    /**
     * 各渠道首天成交情况分析-新媒体沉睡客渠道现金业绩
@@ -96,6 +102,12 @@
    Result shopChannels(@RequestBody OperationalStatementsVo operationalStatementsVo);

    /**
     * 各渠道首天成交情况分析-门诊各渠道首天成交情况分析-导出
     */
    @PostMapping("/admin/operational/shop/channels/export")
    Result shopChannelsExport(@RequestBody OperationalStatementsVo operationalStatementsVo);

    /**
     * 门店&咨询师老带新首天成交金额分析
     */
    @PostMapping("/admin/operational/shop/consultant/deal-analysis")

 phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java

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

import com.hx.resultTool.Result;
import com.hz.his.vo.compare.CompareDeleteVo;
import com.hz.his.vo.compare.CompareListVo;
import com.hz.his.vo.compare.CompareVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**对比照feign
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 * @author CJH
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "compare-photo")
public interface SComparePhoteService {

    /**列表
     * @param compareListVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/list")
    Result listData(@RequestBody CompareListVo compareListVo);


    /**新增对比照
     * @param compareVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/add")
    Result add(@RequestBody CompareVo compareVo);

    /**查看对比照
     * @param compareListVo 传参结构
     * @return data转化为CompareDataVo
     */
    @PostMapping(value = "/compare/photo/record/see")
    Result see(@RequestBody CompareListVo compareListVo);

    /**更新对比照
     * @param compareVo 传参结构
     */
    @PostMapping(value = "/compare/photo/record/update")
    Result update(@RequestBody CompareVo compareVo);

    /**删除对比照总记录
     * @param compareDeleteVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/delete")
    Result delete(@RequestBody CompareDeleteVo compareDeleteVo);

    /**删除对比照子单
     * @param compareDeleteVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/delete/item")
    Result deleteItem(@RequestBody CompareDeleteVo compareDeleteVo);

    /**获取用户项目
     * @param compareListVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/user/project")
    Result userProjectSearchList(@RequestBody CompareListVo compareListVo);

    /**获取用户划扣
     * @param compareListVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/deduction/project")
    Result userDeductionSearchList(@RequestBody CompareListVo compareListVo);

}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java

New file
@@ -0,0 +1,25 @@
package com.hz.his.vo.compare;

import lombok.Data;

/**
 * 新增或者更新实体类
 * @author CJH
 */
@Data
public class CompareDataItemVo {

    /**对比照子单标识*/
    private String id;
    /**角度类型*/
    private Integer angleType;
    /**类型 0术前 1术后 2参考*/
    private Integer type;
    /**文件类型*/
    private Integer fileType;
    /**图片/视频地址*/
    private String imgUrl;
    /**是否对客户可见 0 否 1 是*/
    private Integer isShow;

}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java

New file
@@ -0,0 +1,81 @@
package com.hz.his.vo.compare;

import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * 新增或者更新实体类
 * @author CJH
 */
@Data
public class CompareDataVo {

    /**对比照标识*/
    private String id;
    /**项目第几次上传对比照*/
    private Integer projectFrequency;
    /**用户项目标识*/
    private String userProjectItemId;
    /**划扣项目标识*/
    private String deductionProjectId;
    /**划扣总表标识*/
    private String deductionSingleId;
    /**备注*/
    private String remark;

    /**划扣项目名称*/
    private String deductionProjectName;
    /**用户项目名称*/
    private String userProjectItemName;

    //----项目信息
    /**项目标识*/
    private String projectId;
    /**项目价格*/
    private BigDecimal curPrice;
    /**项目名称*/
    private String projectName;
    /**项目规格*/
    private String specification;

    //----项目信息
    /**用户标识*/
    private String userId;
    /**用户名称*/
    private String userName;
    /**用户CIQ*/
    private String CIQ;
    /**用户会员编号*/
    private String memberNO;
    /**用户病例编号*/
    private String caseNO;

    /**划扣时间*/
    private Date deductionTime;

    /**操作员工标识*/
    private String staffId;
    /**操作员工角色标识*/
    private String staffRoleId;

    /**新增操作人类型*/
    private Integer operatorType;
    /**新增操作人标识*/
    private String operatorId;
    /**新增操作人名称*/
    private String operatorName;

    /**最后变更操作人类型*/
    private Integer updateOpType;
    /**最后变更操作人标识*/
    private String updateOpId;
    /**最后变更操作人名称*/
    private String updateOpName;

    /**子数据*/
    private List<CompareDataItemVo> compareItemList;

}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java

New file
@@ -0,0 +1,25 @@
package com.hz.his.vo.compare;

import lombok.Data;

import java.util.List;

/**
 * 删除实体类
 * @author CJH
 */
@Data
public class CompareDeleteVo {

    /**对比照标识*/
    private String id;

    /**操作员工标识*/
    private String staffId;
    /**操作员工角色标识*/
    private String staffRoleId;

    /**删除的子类标识*/
    private List<String> compareItemList;

}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java

New file
@@ -0,0 +1,23 @@
package com.hz.his.vo.compare;

import lombok.Data;

/**
 * 新增或者更新实体类-图片
 * @author CJH
 */
@Data
public class CompareItemVo {

    /**对比照-子记录标识*/
    private String id;
    /**类型 0术前 1术后 2参考*/
    private Integer type;
    /**角度类型*/
    private Integer angleType;
    /**文件类型（图片/视频）*/
    private Integer fileType;
    /**图片/视频链接*/
    private String url;

}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java

New file
@@ -0,0 +1,51 @@
package com.hz.his.vo.compare;

import lombok.Data;

/**
 * 对比照列表实体
 */
@Data
public class CompareListVo {

    /**当前页数*/
    private Integer pageNum;
    /**当前页显示条数*/
    private Integer pageSize;

    /**对比照标识*/
    private String id;
    /**用户标识*/
    private String userId;
    /**項目标识*/
    private String projectId;
    /**項目名称*/
    private String projectName;

    /**用户項目标识*/
    private String userProjectItemId;



    public Integer getPageNum() {
        if(pageNum == null){
            pageNum = 1;
        }
        return pageNum;
    }

    public void setPageNum(Integer pageNum) {
        this.pageNum = pageNum;
    }

    public Integer getPageSize() {
        if(pageSize == null || pageSize > 500){
            pageSize = 20;
        }
        return pageSize;
    }

    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }
}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java

New file
@@ -0,0 +1,37 @@
package com.hz.his.vo.compare;

import lombok.Data;

import java.util.List;

/**
 * 新增或者更新实体类
 * @author CJH
 */
@Data
public class CompareVo {

    /**对比照标识*/
    private String id;
    /**用户标识*/
    private String userId;
    /**项目标识*/
    private String projectId;
    /**用户项目标识*/
    private String userProjectItemId;
    /**划扣项目标识*/
    private String deductionProjectId;
    /**划扣总表标识*/
    private String deductionSingleId;
    /**备注*/
    private String remark;

    /**操作员工标识*/
    private String staffId;
    /**操作员工角色标识*/
    private String staffRoleId;

    /**子数据*/
    private List<CompareItemVo> compareItemList;

}