查询分公司下的销售部门及部门人员

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<String> getOrgSid(@PathVariable(value = "sid") String sid);
+
+    @GetMapping("/selectOrgList")
+    @ResponseBody
+    @ApiOperation("当前分公司销售部门及部门人员")
+    ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query);
 }

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<String> getOrgSid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
+        return null;
+    }
 }

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<SysOrganization> {
 
     SysOrgVo getListOrgByBrand(String sid);
 
+    List<SysOrganizationListVo> selectOrgList(String orgSid);
+
+    List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -108,7 +108,8 @@
 
     <select id="selectOrgCodeByPsid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganization">
         SELECT *
-        FROM sys_organization LIMIT 0,1
+        FROM sys_organization
+        LIMIT 0,1
     </select>
 
     <select id="selectTreeList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgListVo">
@@ -157,11 +158,9 @@
     </select>
 
     <select id="selectUseOrgSidBySid" resultType="java.util.Map">
-        SELECT
+        SELECT sid,
-                sid,
                name
-        FROM
+        FROM sys_organization
-                sys_organization
         WHERE psid = #{psid}
           AND isDelete = 0
           AND isDept = 0
@@ -170,7 +169,22 @@
     <select id="getListOrgByBrand" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgVo">
         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
     </select>
+
+    <select id="selectOrgList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationListVo">
+        select so.name orgDeptName, so.sid orgDeptSid
+        from sys_organization so
+        where so.psid = #{orgSid}
+          and orgAttributeKey = 'DP03_SYS'
+    </select>
+
+    <select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
+        select distinct si.name staffName, si.sid staffSid
+        from sys_staff_org so
+                 left join sys_staffinfo si on so.staffSid = si.sid
+        where so.orgSid = #{orgDeptSid}
+    </select>
 </mapper>

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<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
+        return sysOrganizationService.selectOrgList(query);
+    }
 }

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<SysOrganizationMa
         sid = sysOrganization.getPsid();
         return getOrgSid(sid);
     }
+
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
+        ResultBean<List<SysOrganizationListVo>> rb = ResultBean.fireFail();
+        //根据用户sid查询分公司sid
+        String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
+        String orgSid = getOrgSid(orgDeptSid);
+        //根据分公司名称查询销售部门的部门
+        List<SysOrganizationListVo> sysOrganizationListVos = baseMapper.selectOrgList(orgSid);
+        sysOrganizationListVos.removeAll(Collections.singleton(null));
+        if (!sysOrganizationListVos.isEmpty()) {
+            for (SysOrganizationListVo vo : sysOrganizationListVos) {
+                orgDeptSid = vo.getOrgDeptSid();
+                List<SysOrgStaffVo> sysOrgStaffVoList = baseMapper.selectByOrgDeptSid(orgDeptSid);
+                vo.setStaffinfoVoList(sysOrgStaffVoList);
+            }
+        }
+        return rb.success().setData(sysOrganizationListVos);
+    }
 }

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<SysStaffOrg> {
     List<SysStaffOrgVo> selectByStaffS(String staffSid);
 
     List<String> selectByOrgSid(String sid);
+
+    String selectByUserSid(String userSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml

@@ -90,6 +90,18 @@
     </select>
 
     <select id="selectByOrgSid" resultType="java.lang.String">
-        select staffSid from sys_staff_org where orgSid = #{sid} and manageType = 2
+        select staffSid
+        from sys_staff_org
+        where orgSid = #{sid}
+          and manageType = 2
+    </select>
+
+    <select id="selectByUserSid" resultType="java.lang.String">
+        select orgSid
+        from sys_staff_org so
+                 left join sys_user su on su.staffSid = so.staffSid
+                 left join sys_staffinfo si on si.sid = su.staffSid
+        where so.manageType = '3'
+          and su.sid = #{userSid}
     </select>
 </mapper>

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<SysStaffOrgMapper, Sy
     public List<String> selectByOrgSid(String sid) {
         return baseMapper.selectByOrgSid(sid);
     }
+
+    public String selectByUserSid(String userSid) {
+        return baseMapper.selectByUserSid(userSid);
+    }
 }

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<ScmVehicleGres
             return rb.setMsg("操作失败!提交的数据不一致");
         }
         String sid = dto.getSid();
-        //存放车架号
+        //查询车架号与存放地点是否匹配
-        //判断要提交的车辆sid是否存在于临时表中
-
         List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs();
+        String vinNo = "";
+        for (ScmVehicleGressionVehDto v : scmVehicleGressionVehDtos) {
+            //根据车辆sid查询存放地点是否与该存放地点一致。将不一致的查询出来
+            ResultBean<BaseVehicleSelectVo> 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<BaseVehicleTempstateVo> carSidList = baseVehicleTempstateFeign.selectAll("001").getData();
             for (BaseVehicleTempstateVo vv : carSidList) {