wangrenhuang
2023-05-16 4c9f508b53662ca8280a92f128250de1dc5dd570
Merge branch 'master' into master-test
3个文件已修改
15 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -26,4 +26,6 @@
    private String startTime;
    /**结束时间*/
    private String endTime;
    /**类型*/
    private Integer type;
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
@@ -1,6 +1,7 @@
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;
@@ -49,4 +50,10 @@
    @PostMapping("/admin/export/shop/other/list")
    Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);
    /**
     * 门店-员工-用户执行业绩
     */
    @PostMapping("/admin/user/deduction/report/shop/emp/list")
    Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);
}
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -1,5 +1,7 @@
package com.hz.phis.dt.user;
import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.math.BigDecimal;
@@ -71,5 +73,9 @@
    private String imgUrl;
    private String hisId;
    private String userBelongingType;
     //电网咨询顾问(TMK) (Employee id)
    private String internetCorpUserId;
    //所属护士
    private String nurseCorpUserId;
}