diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeign.java index a545efa2fb..0d5d1ee1a5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeign.java @@ -41,7 +41,7 @@ public interface BaseAffiliatCompanyFeign { @ApiOperation("新增保存(已测试)") @PostMapping("/save") - public ResultBean save(@Valid @RequestBody BaseAffiliatCompanyDto dto,HttpServletRequest httpServletRequest); + public ResultBean save(@Valid @RequestBody BaseAffiliatCompanyDto dto, HttpServletRequest httpServletRequest); @ApiOperation("修改保存(已测试)") @PostMapping("/update/{sid}") @@ -63,4 +63,10 @@ public interface BaseAffiliatCompanyFeign { @ApiOperation("手机端查询挂靠单位") @PostMapping("getAppAffiliatList") ResultBean> getAppAffiliatList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("销售订单-挂靠公司模糊查询下拉框") + @GetMapping("/salesOrderNamesDown") + ResultBean>> salesOrderNamesDown(@RequestParam(value = "name", required = false) String name, + @RequestParam(value = "staffSid", required = true) String staffSid); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeignFallback.java index fe15277b67..79cd8d1034 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeignFallback.java @@ -61,4 +61,9 @@ public class BaseAffiliatCompanyFeignFallback implements BaseAffiliatCompanyFeig public ResultBean getAppAffiliatList(PagerQuery pagerQuery) { return ResultBean.fireFail().setMsg("接口anrui-base/baseaffiliatcompany/getAppAffiliatList无法访问"); } + + @Override + public ResultBean>> salesOrderNamesDown(String name, String orgSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java index 1a67a3dc43..25b36ef0f3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java @@ -65,7 +65,7 @@ public class BaseAffiliatCompanyRest implements BaseAffiliatCompanyFeign { * @return */ @Override - public ResultBean save(BaseAffiliatCompanyDto dto,HttpServletRequest httpServletRequest) { + public ResultBean save(BaseAffiliatCompanyDto dto, HttpServletRequest httpServletRequest) { ResultBean rb = ResultBean.fireFail(); String registNum = dto.getRegistNum(); int count = baseAffiliatCompanyService.selectRegistNum(registNum); @@ -80,7 +80,7 @@ public class BaseAffiliatCompanyRest implements BaseAffiliatCompanyFeign { List list = dto.getList(); //保存附件信息 if (list.size() > 0) { - int i = baseAffiliatCompanyAppendixService.saveAppendixFile(list, entity.getSid(),httpServletRequest); + int i = baseAffiliatCompanyAppendixService.saveAppendixFile(list, entity.getSid(), httpServletRequest); if (i == 0) { return rb.fail().setMsg("附件保存失败"); } @@ -112,7 +112,7 @@ public class BaseAffiliatCompanyRest implements BaseAffiliatCompanyFeign { List list = dto.getList(); //保存附件信息 if (list.size() > 0) { - int i = baseAffiliatCompanyAppendixService.saveAppendixFile(list, sid,httpServletRequest); + int i = baseAffiliatCompanyAppendixService.saveAppendixFile(list, sid, httpServletRequest); if (i == 0) { return rb.fail().setMsg("附件保存失败"); } @@ -153,7 +153,7 @@ public class BaseAffiliatCompanyRest implements BaseAffiliatCompanyFeign { public ResultBean fetchBySid(String sid) { ResultBean rb = ResultBean.fireFail(); BaseAffiliatCompanyDetailsVo baseAffiliatCompanyVo = baseAffiliatCompanyService.details(sid); - if (baseAffiliatCompanyVo == null){ + if (baseAffiliatCompanyVo == null) { return rb.setMsg("该车辆信息不存在"); } return rb.success().setData(baseAffiliatCompanyVo); @@ -171,7 +171,13 @@ public class BaseAffiliatCompanyRest implements BaseAffiliatCompanyFeign { IPage page = baseAffiliatCompanyService.getAppAffiliatList(pagerQuery); PagerVo vo = new PagerVo<>(); PagerVo pagerVo = PagerUtil.pageToVo(page, vo); - pagerVo.setMsg("查询到以下"+page.getTotal()+"家挂靠单位"); + pagerVo.setMsg("查询到以下" + page.getTotal() + "家挂靠单位"); return rb.success().setData(pagerVo); } + + @Override + public ResultBean>> salesOrderNamesDown(String name, String staffSid) { + List> stringList = baseAffiliatCompanyService.salesOrderNamesDown(name, staffSid); + return new ResultBean>>().success().setData(stringList); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java index 1e10597e6b..8e6da25b64 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java @@ -7,6 +7,7 @@ import com.yxt.anrui.base.api.baseaffiliatcompanyappendix.BaseAffiliatCompanyApp import com.yxt.anrui.base.biz.baseaffiliatcompanyappendix.BaseAffiliatCompanyAppendixService; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -42,6 +43,7 @@ public class BaseAffiliatCompanyService extends MybatisBaseService> salesOrderNamesDown(String name, String staffSid) { + QueryWrapper> qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(name)) { + qw.like("bac.orgName", name); + } + if(StringUtils.isNotBlank(staffSid)){ + String orgSid = ""; + ResultBean stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(staffSid); + if (stringResultBean.getSuccess()) { + orgSid = stringResultBean.getData(); + } + qw.lambda().apply("FIND_IN_SET ('"+orgSid+"',bac.useOrg)"); + } + return baseMapper.namesDown(qw); + } } \ No newline at end of file