问题优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/AppDisAndCustm.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class AppDisAndCustm {
 
-    private String dictKey;
+    private String id;
     private String dictValue;
     private Extra extra;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -146,7 +146,7 @@ public interface BaseDistributorFeign {
 
     @ApiOperation("移动端查询经销商和客户信息")
     @GetMapping("/invoiceName")
-    ResultBean<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath,@RequestParam("search") String search);
+    ResultBean<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath,@RequestParam(value = "search",required = false) String search);
 
     @ApiOperation("根据sid查询所有经销商信息")
     @GetMapping("/selectDisListBySid/{sid}")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -926,9 +926,9 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBankNum())){
                 openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBankNum() + "；";
             }
-            appDisAndCustm.setDictKey(baseDistributorListVo.getSid());
+            appDisAndCustm.setId(baseDistributorListVo.getSid());
             appDisAndCustm.setDictValue(baseDistributorListVo.getName());
-            extra.setSid(appDisAndCustm.getDictKey());
+            extra.setSid(appDisAndCustm.getId());
             extra.setName(appDisAndCustm.getDictValue());
             extra.setInfo(openTickRemarks);
             appDisAndCustm.setExtra(extra);
@@ -944,8 +944,8 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             AppDisAndCustm appDisAndCustm = new AppDisAndCustm();
             Extra extra = new Extra();
             appDisAndCustm.setDictValue(crmCustomerTempListVo.getName());
-            appDisAndCustm.setDictKey(crmCustomerTempListVo.getSid());
-            extra.setSid(appDisAndCustm.getDictKey());
+            appDisAndCustm.setId(crmCustomerTempListVo.getSid());
+            extra.setSid(appDisAndCustm.getId());
             extra.setName(appDisAndCustm.getDictValue());
             extra.setInfo(crmCustomerTempListVo.getIdCard());
             appDisAndCustm.setExtra(extra);

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

@@ -939,7 +939,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //仓库id
         fEntity.setFStockID("ARZSCK");
         //销售折让
-        if (StringUtils.isNotBlank(dto.getSalesAllowance().toString())) {
+        if (dto.getSalesAllowance() != null) {
             fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance().toString());
         }
         if (StringUtils.isNotBlank(dto.getGiftsDescription())) {
@@ -1006,8 +1006,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         QueryWrapper<BaseVehicleOut> qw = new QueryWrapper<>();
         if (params != null) {
             String orgSidPath = params.getOrgSidPath();
-            orgSidPath = sysOrganizationFeign.selectByCJOrgPath(orgSidPath).getData();
-            qw.like("so.orgSidPath", orgSidPath);
+            SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+            String orgLevelKey = data.getOrgLevelKey();
+            if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, 73);
+                qw.like("so.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                qw.eq("bvo.createOrgSid", params.getCreateOrgSid());
+            }
             //车架号
             if (StringUtils.isNotBlank(params.getVinNo())) {
                 qw.like("bvo.vinNo", params.getVinNo());
@@ -1448,12 +1454,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (!"001".equals(payTypeKey)) {//贷款
                 String num = String.format("%02d", j);
                 String FNumber = baseVehicleZSOutApplyDto.getContractNo() + num;
-                j = j++;
+                j = j + 1;
                 Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
                 if (!aBoolean) {
                     bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
                     bdCustomer.setFNumber(FNumber);
                     bdCustomer.setFShortName(baseVehicleZSOutApplyDto.getCustomerName() + FNumber);
+                    bdCustomers.add(bdCustomer);
+                    finKingDeeFeign.draftBdCustomers(bdCustomers);
                 } else {
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchByLSBM(FNumber).getData();
                     //修改客户简称为合同编号
@@ -1559,8 +1567,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             baseVehicleService.updateById(baseVehicle);
             if (!"001".equals(payTypeKey)) {//贷款
                 try {
-                    bdCustomers.add(bdCustomer);
-                    finKingDeeFeign.draftBdCustomers(bdCustomers);
                     //推送主车销售出库单
                     SalOutStock salOutStock = createZSSalOutStock(baseVehicle, baseVehicleOut, baseVehicleOutApply);
                     finKingDeeFeign.draftSalOutStock(salOutStock);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5559,15 +5559,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         OrderQuery pagerQuery = pq.getParams();
         QueryWrapper<BusSalesOrder> qw = new QueryWrapper<>();
         String orgSidPath = pagerQuery.getOrgPath();
-        SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
-        String orgLevelKey = data.getOrgLevelKey();
-        if ("2".equals(orgLevelKey)) {
-            orgSidPath = orgSidPath.substring(0, 73);
-            qw.like("bo.orgSidPath", orgSidPath);
-        } else if ("3".equals(orgLevelKey)) {
-            String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData();
-            qw.eq("bo.useOrgSid", orgSid);
-        }
+        orgSidPath = sysOrganizationFeign.selectByCJOrgPath(orgSidPath).getData();
+        qw.like("bo.orgSidPath", orgSidPath);
         String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState);
         for (AppBusSalesOrderVo record : pagging.getRecords()) {

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

@@ -671,9 +671,11 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         ResultBean rb = ResultBean.fireFail();
         SysOrganizationVo sysOrganizationVo = baseMapper.selectByOrgSidPath(orgPath);
         String orgLevelKey = sysOrganizationVo.getOrgLevelKey();
+        orgPath = orgPath + "/";
         int i1 = orgPath.indexOf("/");
         int i2 = orgPath.indexOf("/", i1 + 1);
         int i3 = orgPath.indexOf("/", i2 + 1);
+        int i4 = orgPath.indexOf("/", i3 + 1);
         List<String> orgPaths = Arrays.asList(orgPath.split("/"));
         if ("1".equals(orgLevelKey) && orgPaths.size() >= Integer.parseInt(orgLevelKey)) {
             orgPath = orgPath.substring(0, i1);
@@ -681,6 +683,10 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
             orgPath = orgPath.substring(0, i2);
         } else if ("3".equals(orgLevelKey) && orgPaths.size() >= Integer.parseInt(orgLevelKey)) {
             orgPath = orgPath.substring(0, i3);
+        } else if ("4".equals(orgLevelKey) && orgPaths.size() >= Integer.parseInt(orgLevelKey)) {
+            orgPath = orgPath.substring(0, i4);
+        } else {
+            orgPath = orgPath.substring(0, orgPath.lastIndexOf("/"));
         }
         return rb.success().setData(orgPath);
     }