Merge remote-tracking branch 'origin/master' into master-test

fwq

2022-12-12 686fd4015c676c57e238bfd765d5daa1b2dbc3d8

Merge remote-tracking branch 'origin/master' into master-test

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.file.FileExUpdateDto;
import com.hz.his.dto.file.FileExportDto;
import com.hz.his.vo.bi.exp.CashierSettlementVo;
import com.hz.his.vo.bi.exp.CashierSurfaceVo;
import com.hz.his.vo.bi.exp.DeductionSurfaceVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**bi的导出程序
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-export")
public interface SExportService {

    /**
     * 导出出纳结算表
     * 无转换
     */
    @PostMapping(value = "/exp/cashier/settlement")
    Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo);

    /**
     * 导出收银报表
     * 转换无
     */
    @PostMapping(value = "/exp/cashier/surface")
    Result cashierSurface(@RequestBody CashierSurfaceVo cashierSurfaceVo);

    /**
     * 导出划扣报表
     * 转换无
     */
    @PostMapping(value = "/exp/deduction/surface")
    Result deductionSurface(@RequestBody DeductionSurfaceVo deductionSurfaceVo);


}

 phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSettlementVo.java

New file
@@ -0,0 +1,27 @@
package com.hz.his.vo.bi.exp;

import lombok.Data;

import java.util.Date;

/**出纳结算
 * @author CJH
 */
@Data
public class CashierSettlementVo {

    /********查询条件*********/
    /**下单时间-开始*/
    private Date startTime;
    /**下单时间-结束*/
    private Date endTime;
    /**所属门店*/
    private String shopId;

    /*******保存参数********/
    /**操作人标识*/
    private String operatorId;
    /**操作人*/
    private String operatorName;

}

 phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSurfaceVo.java

New file
@@ -0,0 +1,27 @@
package com.hz.his.vo.bi.exp;

import lombok.Data;

import java.util.Date;

/**收银报表
 * @author CJH
 */
@Data
public class CashierSurfaceVo {

    /********查询条件*********/
    /**下单时间-开始*/
    private Date startTime;
    /**下单时间-结束*/
    private Date endTime;
    /**所属门店*/
    private String shopId;

    /*******保存参数********/
    /**操作人标识*/
    private String operatorId;
    /**操作人*/
    private String operatorName;

}

 phis-feign/src/main/java/com/hz/his/vo/bi/exp/DeductionSurfaceVo.java

New file
@@ -0,0 +1,27 @@
package com.hz.his.vo.bi.exp;

import lombok.Data;

import java.util.Date;

/**划扣报表
 * @author CJH
 */
@Data
public class DeductionSurfaceVo {

    /********查询条件*********/
    /**下单时间-开始*/
    private Date startTime;
    /**下单时间-结束*/
    private Date endTime;
    /**所属门店*/
    private String shopId;

    /*******保存参数********/
    /**操作人标识*/
    private String operatorId;
    /**操作人*/
    private String operatorName;

}