销售订单-挂靠公司下拉框模糊查询

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<PagerVo<AppBaseAffiliatCompanyChooseVo>> getAppAffiliatList(@RequestBody PagerQuery<BaseAffiliatCompanyQuery> pagerQuery);
+
+    @ApiOperation("销售订单-挂靠公司模糊查询下拉框")
+    @GetMapping("/salesOrderNamesDown")
+    ResultBean<List<Map<String, Object>>> salesOrderNamesDown(@RequestParam(value = "name", required = false) String name,
+                                                              @RequestParam(value = "staffSid", required = true) String staffSid);
+
 }

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<BaseAffiliatCompanyQuery> pagerQuery) {
         return ResultBean.fireFail().setMsg("接口anrui-base/baseaffiliatcompany/getAppAffiliatList无法访问");
     }
+
+    @Override
+    public ResultBean<List<Map<String, Object>>> salesOrderNamesDown(String name, String orgSid) {
+        return null;
+    }
 }

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<BaseAffiliatCompanyAppendixDto> 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<BaseAffiliatCompanyAppendixDto> 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<BaseAffiliatCompanyDetailsVo> 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<AppBaseAffiliatCompanyChooseVo> page = baseAffiliatCompanyService.getAppAffiliatList(pagerQuery);
         PagerVo<AppBaseAffiliatCompanyChooseVo> vo = new PagerVo<>();
         PagerVo<AppBaseAffiliatCompanyChooseVo> pagerVo = PagerUtil.pageToVo(page, vo);
-        pagerVo.setMsg("查询到以下"+page.getTotal()+"家挂靠单位");
+        pagerVo.setMsg("查询到以下" + page.getTotal() + "家挂靠单位");
         return rb.success().setData(pagerVo);
     }
+
+    @Override
+    public ResultBean<List<Map<String, Object>>> salesOrderNamesDown(String name, String staffSid) {
+        List<Map<String, Object>> stringList = baseAffiliatCompanyService.salesOrderNamesDown(name, staffSid);
+        return new ResultBean<List<Map<String, Object>>>().success().setData(stringList);
+    }
 }

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<BaseAffiliatC
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private BaseAffiliatCompanyAppendixService companyAppendixService;
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     /**
      * 经销商分页列表
@@ -166,4 +168,20 @@ public class BaseAffiliatCompanyService extends MybatisBaseService<BaseAffiliatC
     public int updateBySidIsDelete(String sid) {
         return baseMapper.updateBySidIsDelete(sid);
     }
+
+    public List<Map<String, Object>> salesOrderNamesDown(String name, String staffSid) {
+        QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(name)) {
+            qw.like("bac.orgName", name);
+        }
+        if(StringUtils.isNotBlank(staffSid)){
+            String orgSid = "";
+            ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(staffSid);
+            if (stringResultBean.getSuccess()) {
+                orgSid = stringResultBean.getData();
+            }
+            qw.lambda().apply("FIND_IN_SET ('"+orgSid+"',bac.useOrg)");
+        }
+        return baseMapper.namesDown(qw);
+    }
 }