diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java new file mode 100644 index 0000000000..b13bfddbe0 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 15:47 + * @Description + */ +@Data +public class PcSysStaffQuery implements Query { + private static final long serialVersionUID = 1858291601540877140L; + @ApiModelProperty(value = "业务员sid") + private String staffSid; + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java new file mode 100644 index 0000000000..38d71fce43 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 15:44 + * @Description + */ +@Data +public class PcSysStaffVo implements Vo { + private static final long serialVersionUID = -9042032921079833819L; + + private String staffSid; + private String staffName; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java index 8034ddd684..c3ce6e78f7 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -98,4 +99,9 @@ public interface SysStaffinfoFeign { @PostMapping("/searchAppContactsList") public ResultBean> searchAppContactsList(@RequestBody PagerQuery pq); + @ApiOperation("销售订单-内部推荐人下拉框") + @ResponseBody + @GetMapping("/selectStaffList") + ResultBean> selectStaffList(@SpringQueryMap PcSysStaffQuery pcSysStaffQuery); + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java index 57df4f8df6..28328879d8 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -5,6 +5,8 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.util.List; + /** * Project: anrui_portal(门户建设)
* File: SysStaffinfoFeignFallback.java
@@ -63,4 +65,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { return ResultBean.fireFail().setMsg("接口anrui_portal/searchAppContactsList无法访问"); } + @Override + public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + return null; + } + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java index e46db4ed75..93d46d358b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java @@ -110,4 +110,11 @@ public interface SysStaffinfoMapper extends BaseMapper { */ int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey, @Param("jobNumber") String jobNumber, @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason); + + /** + * 查询当前分公司下的员工信息 + * @param orgSid 分公司sid + * @return + */ + List selectStaffList(String orgSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index f4e2130b2f..9862965f56 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -278,4 +278,10 @@ quitReason = #{reason} where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index aec9b92dd7..bef147f7d2 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -165,5 +165,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { return new ResultBean>().success().setData(pv_result); } + @Override + public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + return sysStaffinfoService.selectStaffList(pcSysStaffQuery); + } + } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 7618529ef1..709f5d472f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -500,4 +500,19 @@ public class SysStaffinfoService extends MybatisBaseService> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + ResultBean> rb = ResultBean.fireFail(); + //根据当前staffSid查询分公司sid + String orgSid = ""; + List list = new ArrayList<>(); + ResultBean stringResultBean = sysStaffOrgService.selectSidPathByStaffSid(pcSysStaffQuery.getStaffSid()); + if (stringResultBean.getSuccess()) { + orgSid = stringResultBean.getData(); + } + if(StringUtils.isNotBlank(orgSid)){ + list = baseMapper.selectStaffList(orgSid); + } + return rb.success().setData(list); + } } \ No newline at end of file