From 179b3fbc8bf1a7bb0e36b426d93ea94d30260a1c Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 26 Sep 2022 14:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E9=94=80=E5=94=AE=E9=83=A8=E9=97=A8=E5=8F=8A?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sysorganization/SysOrganizationFeign.java | 7 +- .../SysOrganizationFeignFallback.java | 5 ++ .../SysOrganizationMapper.java | 3 + .../sysorganization/SysOrganizationMapper.xml | 68 +++++++++++-------- .../sysorganization/SysOrganizationRest.java | 5 ++ .../SysOrganizationService.java | 18 +++++ .../biz/sysstafforg/SysStaffOrgMapper.java | 2 + .../biz/sysstafforg/SysStaffOrgMapper.xml | 14 +++- .../biz/sysstafforg/SysStaffOrgService.java | 4 ++ .../ScmVehicleGressionService.java | 21 +++++- 10 files changed, 115 insertions(+), 32 deletions(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 053588b729..879377e42e 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -1,6 +1,5 @@ package com.yxt.anrui.portal.api.sysorganization; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -8,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -134,4 +134,9 @@ public interface SysOrganizationFeign { @ResponseBody @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司") ResultBean getOrgSid(@PathVariable(value = "sid") String sid); + + @GetMapping("/selectOrgList") + @ResponseBody + @ApiOperation("当前分公司销售部门及部门人员") + ResultBean> selectOrgList(@SpringQueryMap SysOrganizationListQuery query); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index 6484d77eca..a7bd307be5 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -137,4 +137,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean getOrgSid(String sid) { return null; } + + @Override + public ResultBean> selectOrgList(SysOrganizationListQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index bd391f31a5..d10355bfe8 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -105,4 +105,7 @@ public interface SysOrganizationMapper extends BaseMapper { SysOrgVo getListOrgByBrand(String sid); + List selectOrgList(String orgSid); + + List selectByOrgDeptSid(String orgDeptSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 707f11b47b..9a0dd40813 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -5,26 +5,26 @@ SELECT * - FROM sys_organization LIMIT 0,1 + FROM sys_organization + LIMIT 0,1 SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath FROM sys_organization so - WHERE isDept = 0 AND so.sid = #{sid} + WHERE isDept = 0 + AND so.sid = #{sid} ORDER BY psid + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 7ecd5563b7..eaa7f0230c 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -356,4 +356,9 @@ public class SysOrganizationRest implements SysOrganizationFeign { String orgSid = sysOrganizationService.getOrgSid(sid); return rb.success().setData(orgSid); } + + @Override + public ResultBean> selectOrgList(SysOrganizationListQuery query) { + return sysOrganizationService.selectOrgList(query); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index ca0e262de6..31f1711941 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -477,4 +477,22 @@ public class SysOrganizationService extends MybatisBaseService> selectOrgList(SysOrganizationListQuery query) { + ResultBean> rb = ResultBean.fireFail(); + //根据用户sid查询分公司sid + String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid()); + String orgSid = getOrgSid(orgDeptSid); + //根据分公司名称查询销售部门的部门 + List sysOrganizationListVos = baseMapper.selectOrgList(orgSid); + sysOrganizationListVos.removeAll(Collections.singleton(null)); + if (!sysOrganizationListVos.isEmpty()) { + for (SysOrganizationListVo vo : sysOrganizationListVos) { + orgDeptSid = vo.getOrgDeptSid(); + List sysOrgStaffVoList = baseMapper.selectByOrgDeptSid(orgDeptSid); + vo.setStaffinfoVoList(sysOrgStaffVoList); + } + } + return rb.success().setData(sysOrganizationListVos); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java index 9384ef8d24..280bd0fc5c 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java @@ -102,4 +102,6 @@ public interface SysStaffOrgMapper extends BaseMapper { List selectByStaffS(String staffSid); List selectByOrgSid(String sid); + + String selectByUserSid(String userSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml index 1cbe120b0e..c6b98ab524 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml @@ -90,6 +90,18 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index 79cdc7715c..8afbc56ccb 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -281,4 +281,8 @@ public class SysStaffOrgService extends MybatisBaseService selectByOrgSid(String sid) { return baseMapper.selectByOrgSid(sid); } + + public String selectByUserSid(String userSid) { + return baseMapper.selectByUserSid(userSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 15bc378e61..87f03503ff 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -677,10 +677,25 @@ public class ScmVehicleGressionService extends MybatisBaseService scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs(); + String vinNo = ""; + for (ScmVehicleGressionVehDto v : scmVehicleGressionVehDtos) { + //根据车辆sid查询存放地点是否与该存放地点一致。将不一致的查询出来 + ResultBean baseVehicleSelectVoResultBean = baseVehicleFeign.details(v.getVehSid()); + if (!baseVehicleSelectVoResultBean.getSuccess()) { + return rb.setMsg("选择的车辆中包含车辆不存在的数据"); + } + BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleSelectVoResultBean.getData(); + if (!dto.getLocationSid().equals(baseVehicleSelectVo.getLocation())) { + vinNo = v.getVehVin() + ","; + } + } + if (StringUtils.isNotBlank(vinNo)) { + vinNo = vinNo.replace(",", ""); + return rb.setMsg(vinNo + "的车辆不再该现存放地点内"); + } + //判断要提交的车辆sid是否存在于临时表中 for (ScmVehicleGressionVehDto v : scmVehicleGressionVehDtos) { List carSidList = baseVehicleTempstateFeign.selectAll("001").getData(); for (BaseVehicleTempstateVo vv : carSidList) {