问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -7,6 +7,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author dimengzhe
  * @Date 2022/9/23 14:12
@@ -34,6 +37,10 @@ public interface BaseVehicleOutFeign {
     @ResponseBody
     ResultBean<BaseVehicleOutDetailsVo> details(@PathVariable("sid") String sid);
 
+    @ApiOperation("根据层级获取分公司信息")
+    @PostMapping("/selectOrgByLevel")
+    @ResponseBody
+    ResultBean<List<Map<String,String>>> selectOrgByLevel(@RequestParam("orgSidPath") String orgSidPath);
 
 }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@@ -9,6 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author dimengzhe
  * @Date 2022/9/23 14:11
@@ -38,4 +41,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     public ResultBean<BaseVehicleOutDetailsVo> details(String sid) {
         return baseVehicleOutService.details(sid);
     }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> selectOrgByLevel(String orgSidPath) {
+        return baseVehicleOutService.selectOrgByLevel(orgSidPath);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -13,6 +13,7 @@ import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
+import com.yxt.anrui.portal.api.sysorganization.SysOrgVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
@@ -27,9 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Author dimengzhe
@@ -49,6 +48,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private ScmWarehouseFeign scmWarehouseFeign;
     @Autowired
     private BaseMiddlemanService baseMiddlemanService;
+
     public ResultBean vehicleOut(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
        /* List<BaseVehicleOutQuery> list = dto.getQueryList();
@@ -103,7 +103,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             BdCustomer bdCustomer = createBdCustomer(baseVehicle, dto);
             ResultBean resultBeanCustomer = finKingDeeFeign.updateSingleCustomer(bdCustomer);
             //推送财务中介人
-            if(StringUtils.isNotBlank( dto.getMiddleOne())){
+            if (StringUtils.isNotBlank(dto.getMiddleOne())) {
                 BdCustomer bdMiddle = createBdMiddle(baseVehicle, dto);
                 ResultBean resultBeanMiddle = finKingDeeFeign.draftBdCustomer(bdMiddle);
             }
@@ -122,7 +122,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         BdCustomer bdCustomer = new BdCustomer();
         String vinNo = baseVehicle.getVinNo();
         //客户编码=简拼+车架号后8位
-        bdCustomer.setFNumber(HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName())+vinNo.substring(vinNo.length()-8));
+        bdCustomer.setFNumber(HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + vinNo.substring(vinNo.length() - 8));
         bdCustomer.setOldFNumber(dto.getCustomerNo());
         ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid());
         if (resultBean.getSuccess()) {
@@ -132,7 +132,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
         }
         //客户名称=客户名称+车架号后8位
-        bdCustomer.setFName(dto.getCustomerName()+vinNo.substring(vinNo.length()-8));
+        bdCustomer.setFName(dto.getCustomerName() + vinNo.substring(vinNo.length() - 8));
         //客户简称=合同编号
         bdCustomer.setFShortName(dto.getConcatNo());
         return bdCustomer;
@@ -151,13 +151,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //TODO 去中介人表 查询手机号码  根据中介人sid: middleOneSid
         //  拼接： bdCustomer.setFName(中介人名称（MiddleOne） + 手机号后四位);
         BaseMiddleman baseMiddleman = baseMiddlemanService.fetchBySid(dto.getMiddleOneSid());
-        if(baseMiddleman!=null){
+        if (baseMiddleman != null) {
             String mobile = baseMiddleman.getMobile();
             String middleOne = dto.getMiddleOne();
-            middleOne=middleOne+mobile.substring(mobile.length()-4);
+            middleOne = middleOne + mobile.substring(mobile.length() - 4);
             bdCustomer.setFName(middleOne);
             bdCustomer.setFNumber(baseMiddleman.getMiddleCode());
-        }else{
+        } else {
             bdCustomer.setFName("");
         }
         return bdCustomer;
@@ -337,8 +337,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 qw.eq("bvo.staffSid", params.getStaffSid());
             }
             //内部编码
-            if (StringUtils.isNotBlank(params.getInsideCode())){
-                qw.like("bv.insideCode",params.getInsideCode());
+            if (StringUtils.isNotBlank(params.getInsideCode())) {
+                qw.like("bv.insideCode", params.getInsideCode());
             }
             qw.orderByDesc("bvo.saleDate");
         }
@@ -358,4 +358,38 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseMapper.details(sid);
         return rb.success().setData(baseVehicleOutDetailsVo);
     }
+
+    public ResultBean<List<Map<String, String>>> selectOrgByLevel(String orgSidPath) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> maps = new ArrayList<>();
+        SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+        String orgLevelKey = data.getOrgLevelKey();
+        if ("2".equals(orgLevelKey)) {
+            String sybSid = orgSidPath.substring(36, 73);
+            List<SysOrganizationVo> sysOrganizationVos = sysOrganizationFeign.selectOrgByPSid(sybSid).getData();
+            for (SysOrganizationVo sysOrganizationVo : sysOrganizationVos) {
+                Map<String, String> map = new HashMap<>();
+                map.put("sid", sysOrganizationVo.getSid());
+                map.put("name", sysOrganizationVo.getName());
+                maps.add(map);
+            }
+        } else if ("3".equals(orgLevelKey)) {
+            Map<String, String> map = new HashMap<>();
+            String orgSid = orgSidPath.substring(74, 110);
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(orgSid).getData();
+            String name = sysOrganizationVo.getName();
+            map.put("sid", orgSid);
+            map.put("name", name);
+            maps.add(map);
+        } else if ("1".equals(orgLevelKey)) {
+            List<SysOrgVo> sysOrgVos = sysOrganizationFeign.getListOrg().getData();
+            for (SysOrgVo sysOrgVo : sysOrgVos) {
+                Map<String, String> map = new HashMap<>();
+                map.put("sid", sysOrgVo.getSid());
+                map.put("name", sysOrgVo.getName());
+                maps.add(map);
+            }
+        }
+        return rb.success();
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenurole/SysMobileMenuRoleFeign.java

@@ -22,7 +22,7 @@ import java.util.List;
 public interface SysMobileMenuRoleFeign {
 
     @ApiOperation("应用授权列表 ")
-    @GetMapping("/getRoleMenuList")
+    @PostMapping("/getRoleMenuList")
     @ResponseBody
     ResultBean<List<SysMobileMenuRoleVo>> getRoleMenuList(@RequestParam("roleSid") String roleSid);
 

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenurole/SysMobileMenuRoleVo.java

@@ -15,9 +15,9 @@ import java.util.List;
 public class SysMobileMenuRoleVo implements Vo {
     private static final long serialVersionUID = -2992681724218948454L;
     @ApiModelProperty("菜单名称")
-    private String menuName;
+    private String name;
     @ApiModelProperty("菜单sid")
-    private String menuSid;
+    private String sid;
     @ApiModelProperty("是否选中，1：未选中,0：选中")
     private String checked;
 

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -165,6 +165,11 @@ public interface SysOrganizationFeign {
     @ApiOperation("所有分公司sid")
     ResultBean<List<SysOrganizationVo>> selectOrgSidList();
 
+    @GetMapping("/selectOrgByPSid")
+    @ResponseBody
+    @ApiOperation("查询事业部下所有分公司")
+    ResultBean<List<SysOrganizationVo>> selectOrgByPSid(@RequestParam("psid") String psid);
+
     @GetMapping("/selectByOrgSidPath")
     @ResponseBody
     @ApiOperation("组织层级分页查询")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -168,6 +168,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationVo>> selectOrgByPSid(String psid) {
+        return null;
+    }
+
     @Override
     public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
         return null;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleService.java

@@ -55,8 +55,8 @@ public class SysMobileMenuRoleService extends MybatisBaseService<SysMobileMenuRo
         List<SysMobileMenuRoleVo> sysMobileMenuRoleVos = new ArrayList<>();
         for (AppSubsetVersionVo s : appSubsetVersionVoList) {
             SysMobileMenuRoleVo sysMenuVo = new SysMobileMenuRoleVo();
-            sysMenuVo.setMenuName(s.getAppName());
-            sysMenuVo.setMenuSid(s.getAppSid());
+            sysMenuVo.setName(s.getAppName());
+            sysMenuVo.setSid(s.getAppSid());
             sysMenuVo.setChecked("1");
             String appSid = s.getAppSid();
             sysMenuVo.setChidren(listAllByRoleSid(roleSid, appSid));
@@ -88,7 +88,7 @@ public class SysMobileMenuRoleService extends MybatisBaseService<SysMobileMenuRo
      * @param appSid  appSid
      */
     private void getChildrensByRoleSid(SysMobileMenuRoleVo s, String roleSid, String appSid) {
-        String sid = s.getMenuSid();
+        String sid = s.getSid();
         List<SysMobileMenuRoleVo> sysMenuVos = baseMapper.getChildrensByRoleSid(roleSid, sid, appSid);
         if (!sysMenuVos.isEmpty()) {
             for (SysMobileMenuRoleVo smv : sysMenuVos) {

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

@@ -118,4 +118,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrganizationVo selectByOrgSidPath(String orgSidPath);
 
     List<SysOrgVo> getListDeptByOrgSid(String orgSid);
+
+    List<SysOrganizationVo> selectOrgByPSid(String psid);
 }

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

@@ -211,4 +211,10 @@
         WHERE isDept = 1
           AND so.psid = #{orgSid}
     </select>
+
+    <select id="selectOrgByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 0 AND so.psid = #{psid}
+    </select>
 </mapper>

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

@@ -391,6 +391,11 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return rb.success().setData(stringList);
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationVo>> selectOrgByPSid(String psid) {
+        return sysOrganizationService.selectOrgByPSid(psid);
+    }
+
     @Override
     public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
         return sysOrganizationService.selectByOrgSidPath(orgSidPath);

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

@@ -552,4 +552,10 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         List<SysOrgVo> sysOrgVos = baseMapper.getListDeptByOrgSid(orgSid);
         return rb.success().setData(sysOrgVos);
     }
+
+    public ResultBean<List<SysOrganizationVo>> selectOrgByPSid(String psid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysOrganizationVo> sysOrganizationVos = baseMapper.selectOrgByPSid(psid);
+        return rb.success().setData(sysOrganizationVos);
+    }
 }