移动端切换机构

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.api.basediscountpackage;
 
+import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -7,6 +8,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -69,6 +71,6 @@ public interface BaseDiscountpackageFeign {
     ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@PathVariable(value = "userSid") String userSid);
 
     @ApiOperation("移动端-销售订单获取销售政策优惠包:切换机构")
-    @GetMapping("/getAppPackage/{userSid}/{orgPath}")
-    ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@PathVariable(value = "userSid") String userSid,@PathVariable(value = "orgPath") String orgPath);
+    @GetMapping("/getAppPackage")
+    ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@SpringQueryMap AppBaseDiscountpackageQuery appBaseDiscountpackageQuery);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java

@@ -67,7 +67,7 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
     }
 
     @Override
-    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid, String orgPath) {
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery appBaseDiscountpackageQuery) {
         return null;
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/app/AppBaseDiscountpackageQuery.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.api.basediscountpackage.app;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -9,8 +10,9 @@ import lombok.Data;
  * @Description
  */
 @Data
-public class AppBaseDiscountpackageQuery implements Query {
-    private static final long serialVersionUID = 4058239365095597367L;
+public class AppBaseDiscountpackageQuery {
 
     private String userSid;
+    @ApiModelProperty("组织机构")
+    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java

@@ -19,6 +19,7 @@ public class BaseInterNalPurchaseCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "用户全路径不能为空")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java

@@ -19,6 +19,7 @@ public class BaseModelModPriceCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "用户全路径不能为空")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java

@@ -55,6 +55,4 @@ public class BusinessVariablesDto {
      * 业务参数，按需传递
      */
     private Map<String, Object> formVariables;
-
-    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -1,10 +1,7 @@
 package com.yxt.anrui.base.api.basevehicle;
 
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
-import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
-import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
-import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
-import com.yxt.anrui.base.api.basevehicle.app.VinQuery;
+import com.yxt.anrui.base.api.basevehicle.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -405,8 +402,8 @@ public interface BaseVehicleFeign {
     public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid);
 
     @ApiOperation("根据仓库sid 获取车架号")
-    @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}/{orgPath}")
-    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid, @PathVariable(value = "orgPath", required = false) String orgPath);
+    @GetMapping("/getVinByWarehouseSid")
+    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@SpringQueryMap GetVinQuery getVinQuery);
 
     /**
      * 存放地点变更选择车辆
@@ -430,7 +427,7 @@ public interface BaseVehicleFeign {
     @PostMapping("/selectByVinNoAndOrgSid")
     ResultBean<BaseVehicle> selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo, @RequestParam("createOrgSid") String createOrgSid);
 
-    @ApiOperation("巡检获取车价号")
+    @ApiOperation("巡检获取车价号：已添加切换机构")
     @PostMapping("/getInspectionVinList")
     @ResponseBody
     public ResultBean<PagerVo<InspectionVinVo>> getInspectionVinList(@RequestBody PagerQuery<InspectionVinQuery> pagerQuery);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -1,10 +1,7 @@
 package com.yxt.anrui.base.api.basevehicle;
 
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
-import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
-import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
-import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
-import com.yxt.anrui.base.api.basevehicle.app.VinQuery;
+import com.yxt.anrui.base.api.basevehicle.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -310,7 +307,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) {
+    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(GetVinQuery getVinQuery) {
         return null;
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/GetVinQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.base.api.basevehicle.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 21:10
+ * @Description
+ */
+@Data
+public class GetVinQuery {
+    @ApiModelProperty("仓库sid")
+    private String warehouseSid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构")
+    private String orgPath;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java

@@ -20,6 +20,7 @@ public class BaseActualSalesCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "用户全路径不能为空")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java

@@ -115,8 +115,8 @@ public interface BaseVehicleBrandFeign {
     ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(@PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-获取品牌数据字典:切换组织机构")
-    @GetMapping("/selectAppListByUserSid/{userSid}/{orgPath}")
-    ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    @GetMapping("/selectAppListByUserSid")
+    ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(@SpringQueryMap VehicleBrandQuery vehicleBrandQuery);
 
     @ApiOperation("根据品牌sid获取品牌信息")
     @GetMapping("/fetchBySid/{sid}")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java

@@ -82,7 +82,7 @@ public class BaseVehicleBrandFeignFallback implements BaseVehicleBrandFeign {
     }
 
     @Override
-    public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(String userSid, String orgPath) {
+    public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(VehicleBrandQuery vehicleBrandQuery) {
         return null;
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/VehicleBrandQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.base.api.basevehiclebrand;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 21:30
+ * @Description
+ */
+@Data
+public class VehicleBrandQuery {
+
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java

@@ -19,7 +19,7 @@ public class BusVehicleApplyCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
+    @NotBlank(message = "用户全路径不能为空")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basediscountpackage;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basediscountpackage.*;
+import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -131,12 +132,14 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
 
     @Override
     public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
-        return baseDiscountpackageService.getAppPackage(userSid,"");
+        AppBaseDiscountpackageQuery appBaseDiscountpackageQuery = new AppBaseDiscountpackageQuery();
+        appBaseDiscountpackageQuery.setUserSid(userSid);
+        return baseDiscountpackageService.getAppPackage(appBaseDiscountpackageQuery);
     }
 
     @Override
-    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid, String orgPath) {
-        return baseDiscountpackageService.getAppPackage(userSid,orgPath);
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery appBaseDiscountpackageQuery) {
+        return baseDiscountpackageService.getAppPackage(appBaseDiscountpackageQuery);
     }
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basediscountpackage.*;
+import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
@@ -316,8 +317,10 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         return qw;
     }
 
-    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid, String orgPath) {
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery appBaseDiscountpackageQuery) {
         ResultBean<List<AppBaseDiscountpackageVo>> rb = ResultBean.fireFail();
+        String orgPath = appBaseDiscountpackageQuery.getOrgPath();
+        String userSid = appBaseDiscountpackageQuery.getUserSid();
         QueryWrapper<BaseDiscountpackage> qw = new QueryWrapper<>();
         if (StringUtils.isBlank(orgPath)) {
             if (StringUtils.isNotBlank(userSid)) {
@@ -329,6 +332,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
                 qw.lambda().apply("FIND_IN_SET ('" + orgPath + "',useOrg)");
             }
         } else {
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
             qw.lambda().apply("FIND_IN_SET ('" + orgPath + "',useOrg)");
         }
         qw.eq("salesPolicyKey", "0002");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -433,11 +433,6 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
 
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        if(StringUtils.isBlank(bv.getOrgPath())){
-            if(StringUtils.isBlank(bv.getOrgSidPath())){
-                return rb.setMsg("参数错误：orgSidPath");
-            }
-        }
         BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
         Map<String, Object> formVariables = bv.getFormVariables();
         if (formVariables != null) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -299,7 +299,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
             String finalSid = sid;
-            Future future1 = pool.submit(() -> {
+           /* Future future1 = pool.submit(() -> {
                 //查询所有分公司，并向所有分公司中插入供应商信息
                 ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
                 List<SysOrganizationVo> list = orgList.getData();
@@ -315,7 +315,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                         insert(baseManufacturer);
                     }
                 }
-            });
+            });*/
             Future future2 = pool.submit(() -> {
                 //金蝶推送
                 BdSupplier bdSupplier = new BdSupplier();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@@ -122,7 +122,8 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
                     qw.eq("useOrgSid", resultBean.getData());
                 }
             }else{
-                qw.eq("useOrgSid", params.getOrgPath());
+                String orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
+                qw.eq("useOrgSid", orgPath);
             }
 
         }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -314,11 +314,6 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
 
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        if(StringUtils.isBlank(bv.getOrgPath())){
-            if(StringUtils.isBlank(bv.getOrgSidPath())){
-                return rb.setMsg("参数错误：orgSidPath");
-            }
-        }
         BaseModelModprice baseModelModprice = fetchBySid(bv.getBusinessSid());
         List<BaseModelModpriceModelVo> baseModelModpriceModelVos = baseModelModpriceModelService.fetchByMainSid(bv.getBusinessSid());
         if (bv.getTaskId().equals(baseModelModprice.getTaskId())) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -524,11 +524,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rrb = ResultBean.fireFail();
-        if(StringUtils.isBlank(bv.getOrgPath())){
-            if(StringUtils.isBlank(bv.getOrgSidPath())){
-                return rrb.setMsg("参数错误：orgSidPath");
-            }
-        }
         BaseOutsourcingApplication booad = fetchBySid(bv.getBusinessSid());
         String businessTaskid = booad.getTaskId();
         if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -8,15 +8,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
-import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplication;
 import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
-import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
-import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
-import com.yxt.anrui.base.api.basevehicle.app.VinQuery;
+import com.yxt.anrui.base.api.basevehicle.app.*;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
@@ -39,7 +34,6 @@ import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.utils.ExportExcelUtils;
@@ -1097,12 +1091,15 @@ public class BaseVehicleRest implements BaseVehicleFeign {
 
     @Override
     public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid) {
-        return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid, "");
+        GetVinQuery getVinQuery = new GetVinQuery();
+        getVinQuery.setWarehouseSid(warehouseSid);
+        getVinQuery.setUserSid(userSid);
+        return baseVehicleService.getVinByWarehouseSid(getVinQuery);
     }
 
     @Override
-    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) {
-        return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid, orgPath);
+    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(GetVinQuery getVinQuery) {
+        return baseVehicleService.getVinByWarehouseSid(getVinQuery);
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -8,6 +8,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicle.app.GetVinQuery;
 import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
 import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
@@ -1063,6 +1064,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath) {
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath);
         if (vins.size() <= 0) {
@@ -2006,12 +2009,17 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return rb.success().setData(path);
     }
 
-    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) {
+    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(GetVinQuery getVinQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String warehouseSid = getVinQuery.getWarehouseSid();
+        String userSid = getVinQuery.getUserSid();
+        String orgPath = getVinQuery.getOrgPath();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         List<String> carSidList = baseVehicleTempstateService.selectAll("001");
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         if (StringUtils.isNotBlank(orgPath)) {
             qw.eq("bv.createOrgSid", orgPath);
@@ -2966,6 +2974,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             String orgPath = params.getOrgPath();
             if (StringUtils.isBlank(orgPath)) {
                 orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+            }else{
+                orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
             }
             params.setUseOrgSid(orgPath);
             if (StringUtils.isNotBlank(params.getName())) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -435,11 +435,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(bv.getOrgPath())) {
-            if (StringUtils.isBlank(bv.getOrgSidPath())) {
-                return rb.setMsg("参数错误：orgSidPath");
-            }
-        }
         BaseVehicleActualSales baseVehicleActualSales = fetchBySid(bv.getBusinessSid());
         if (bv.getTaskId().equals(baseVehicleActualSales.getTaskId())) {
             //判断车辆的结算状态是否包含预买断的状态，如果是的话，返回审核失败

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java

@@ -173,13 +173,15 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign {
 
     @Override
     public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(String userSid) {
-        List<BaseVehicleBrandDictionariesVo> list = baseVehicleBrandService.selectAppListByUserSid(userSid,"");
+        VehicleBrandQuery vehicleBrandQuery = new VehicleBrandQuery();
+        vehicleBrandQuery.setUserSid(userSid);
+        List<BaseVehicleBrandDictionariesVo> list = baseVehicleBrandService.selectAppListByUserSid(vehicleBrandQuery);
         return  new ResultBean<List<BaseVehicleBrandDictionariesVo>>().success().setData(list);
     }
 
     @Override
-    public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(String userSid, String orgPath) {
-        List<BaseVehicleBrandDictionariesVo> list = baseVehicleBrandService.selectAppListByUserSid(userSid,orgPath);
+    public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(VehicleBrandQuery vehicleBrandQuery) {
+        List<BaseVehicleBrandDictionariesVo> list = baseVehicleBrandService.selectAppListByUserSid(vehicleBrandQuery);
         return  new ResultBean<List<BaseVehicleBrandDictionariesVo>>().success().setData(list);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java

@@ -219,12 +219,15 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
     /**
      * 手机端-获取品牌数据字典
      *
-     * @param userSid
      * @return
      */
-    public List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(String userSid,String orgPath) {
+    public List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(VehicleBrandQuery vehicleBrandQuery) {
+        String userSid = vehicleBrandQuery.getUserSid();
+        String orgPath = vehicleBrandQuery.getOrgPath();
         if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         List<BaseVehicleBrandDictionariesVo> list = baseMapper.selectAppListByUserSid(orgPath);
         return list;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionDto;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.busvehicleapply.*;
 import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo;
@@ -470,11 +469,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(bv.getOrgPath())) {
-            if (StringUtils.isBlank(bv.getOrgSidPath())) {
-                return rb.setMsg("参数错误：orgSidPath");
-            }
-        }
         String businessSid = bv.getBusinessSid();
         BusVehicleApply busVehicleApply = fetchBySid(businessSid);
         Map<String, Object> variables = new HashMap<>();

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -384,6 +384,10 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                 qw.eq("cct.staffSid",staffSid);
             }
             if(StringUtils.isNotBlank(orgPath)){
+                orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                qw.eq("cct.createOrgSid",orgPath);
+            }else{
+                orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
                 qw.eq("cct.createOrgSid",orgPath);
             }
             if(StringUtils.isNotBlank(name)){

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java

@@ -62,6 +62,6 @@ public class BusinessVariables {
      * 业务参数，按需传递
      */
     private Map<String, Object> formVariables =new HashMap<>();
-    @ApiModelProperty("机构sid:切换结构使用")
-    private String orgPath;
+  /*  @ApiModelProperty("机构sid:切换结构使用")
+    private String orgPath;*/
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -116,7 +116,6 @@ public class FlowableRest implements FlowableFeign {
     public ResultBean<UserAndOrgPath> getNextNodeUserSidsOfCreate(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         String orgSidPath=bv.getOrgSidPath();
-        String orgPath = bv.getOrgPath();
         //根据业务参数取流程流转的环节 信息
         List<Map<String, Object>> list = (List<Map<String, Object>>) flowtaskService.getProcessCirculationNodesByMap(bv).getData();
         if(list==null||list.size()<2){
@@ -127,10 +126,10 @@ public class FlowableRest implements FlowableFeign {
         if(o==null){
             return rb.setMsg("流程设计问题");
         }
-        return getNextUserSids(rb, orgSidPath, o,orgPath);
+        return getNextUserSids(rb, orgSidPath, o);
     }
 
-    private ResultBean< UserAndOrgPath> getNextUserSids(ResultBean rb, String orgSidPath, Object o,String orgPath) {
+    private ResultBean< UserAndOrgPath> getNextUserSids(ResultBean rb, String orgSidPath, Object o) {
         UserAndOrgPath mapParam=new UserAndOrgPath();
         JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(o));
         String roleSid = jsonArray.get(0).toString();
@@ -138,7 +137,6 @@ public class FlowableRest implements FlowableFeign {
         UserQuery userQuery = new UserQuery();
         userQuery.setRoleSid(roleSid);
         userQuery.setOrgSidPath(orgSidPath);
-        userQuery.setOrgPath(orgPath);
         List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
         if(sysUserVos==null||sysUserVos.size()<1){
             return rb.fail().setMsg("环节没有用户");
@@ -166,7 +164,6 @@ public class FlowableRest implements FlowableFeign {
         ResultBean<UserAndOrgPath> rb = ResultBean.fireSuccess();
         String orgSidPath=bv.getOrgSidPath();
         String taskDefKey=bv.getTaskDefKey();
-        String orgPath = bv.getOrgPath();
         //根据业务参数取流程流转的环节 信息
         List<Map<String, Object>> list = (List<Map<String, Object>>)
                 flowtaskService.getProcessCirculationNodesByMap(bv).getData();
@@ -185,7 +182,7 @@ public class FlowableRest implements FlowableFeign {
             return rb.setData(new UserAndOrgPath());
         }else{
             Object o = task_map.get("candidateGroups");
-            return getNextUserSids(rb, orgSidPath, o,orgPath);
+            return getNextUserSids(rb, orgSidPath, o);
         }
     }
 
@@ -353,7 +350,6 @@ public class FlowableRest implements FlowableFeign {
                         UserQuery userQuery = new UserQuery();
                         userQuery.setRoleSid(roleSid);
                         userQuery.setOrgSidPath(dto.getOrgSidPath());
-                        userQuery.setOrgPath(dto.getOrgPath());
                         List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
                         sysUserVoLists.addAll(sysUserVos);
                     }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoQuery.java

@@ -19,4 +19,7 @@ public class FlowTaskDoQuery implements Query {
     private String userSid;
     @ApiModelProperty("工作名称")
     private String names;
+
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java

@@ -104,4 +104,9 @@ public interface SysStaffOrgFeign {
     @ResponseBody
     @ApiOperation("根据组织staffSid获取分公司SysStaffOrg")
     ResultBean<SysStaffOrg> getOrgByStaffSid(@RequestParam(value = "staffSid") String staffSid);
+
+    @GetMapping("/getOrgSidByPath")
+    @ResponseBody
+    @ApiOperation("根据用户组织全路径获取用户的分公司sid")
+    ResultBean<String> getOrgSidByPath(@RequestParam("orgPath") String orgPath);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java

@@ -95,6 +95,11 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> getOrgSidByPath(String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
 		return null;

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -43,8 +44,8 @@ public interface AppSysUserFeign {
 
     @ApiOperation(value = "我的信息:切换机构")
     @ResponseBody
-    @GetMapping("/getMyInfo/{userSid}/{orgPath}")
-    public ResultBean getMyInfo(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    @GetMapping("/getMyInfo")
+    public ResultBean getMyInfo(@SpringQueryMap MyInfoQuery myInfoQuery);
 
     @ApiOperation(value = "手机更改密码")
     @ResponseBody

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java

@@ -32,7 +32,7 @@ public class AppSysUserFeignFallback implements AppSysUserFeign {
     }
 
     @Override
-    public ResultBean getMyInfo(String userSid, String orgPath) {
+    public ResultBean getMyInfo(MyInfoQuery myInfoQuery) {
         return null;
     }
 

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.portal.api.sysuser.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 15:24
+ * @Description
+ */
+@Data
+public class MyInfoQuery implements Query {
+    private static final long serialVersionUID = -4771501933318214145L;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -373,13 +373,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setValue(processDefinitionId);
             taskParamList.add(taskParam);
         }
-       // if (StringUtils.isNotBlank(orgSid)) {
-            BusinessTaskParam taskParam = new BusinessTaskParam();
-            taskParam.setField(BusinessVariables.ORGPATH);
-            taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
-            taskParam.setValue("123456789");//orgSid);
-            taskParamList.add(taskParam);
-      //  }
+        // if (StringUtils.isNotBlank(orgSid)) {
+        BusinessTaskParam taskParam = new BusinessTaskParam();
+        taskParam.setField(BusinessVariables.ORGPATH);
+        taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
+        taskParam.setValue("123456789");//orgSid);
+        taskParamList.add(taskParam);
+        //  }
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
         return flowTaskFeign.businessTodoList(userSid, taskQueryPagerQuery);
@@ -388,8 +388,9 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
     public ResultBean<Integer> getTodoNum(String userSid) {
         return flowTaskFeign.getTodoNum(userSid);
     }
-    public ResultBean<Integer> getTodoNum(String userSid,String orgPath) {
-        return flowTaskFeign.getTodoNum(userSid,orgPath);
+
+    public ResultBean<Integer> getTodoNum(String userSid, String orgPath) {
+        return flowTaskFeign.getTodoNum(userSid, orgPath);
     }
 
     public ResultBean getNextTasks(String taskId) {
@@ -460,6 +461,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         FlowTaskDoQuery params = pagerQuery.getParams();
         String names = params.getNames();
         String userSid = params.getUserSid();
+        String orgPath = params.getOrgPath();
         BusinessTaskQuery taskQuery = new BusinessTaskQuery();
         List<BusinessTaskParam> taskParamList = new ArrayList<>();
         if (StringUtils.isNotBlank(names)) {
@@ -469,6 +471,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.LIKE);
             taskParamList.add(taskParam);
         }
+        if (StringUtils.isNotBlank(orgPath)) {//切换机构
+            BusinessTaskParam taskParam = new BusinessTaskParam();
+            taskParam.setField(BusinessVariables.ORGPATH);
+            taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
+            taskParam.setValue(orgPath);
+            taskParamList.add(taskParam);
+        }
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
         ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery);
@@ -507,7 +516,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
 
             } else if ("2".equals(type)) {
                 //插件
-                if(StringUtils.isNotBlank(appSid)){
+                if (StringUtils.isNotBlank(appSid)) {
                     String appSid2 = appSid.substring(0, appSid.indexOf("#"));
                     List<Integer> integers = appVer.get(appSid2);
                     if (integers == null) {
@@ -530,7 +539,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
                 for (int i = 0; i < integers.size(); i++) {
                     Integer integer = integers.get(i);
                     String path = fileUploadComponent.getUrlPrefix();
-                    voList.get(integer).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl());
+                    voList.get(integer).getAppVariables().setPath(path + appSubsetVersions.getUpdateUrl());
                     voList.get(integer).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode());
                     voList.get(integer).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName());
                 }
@@ -540,7 +549,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         page.setCurrent(resultBean.getData().getCurrent());
         page.setSize(resultBean.getData().getSize());
         page.setTotal(resultBean.getData().getTotal());
-        long pages = (resultBean.getData().getTotal() + resultBean.getData().getSize() -1) / resultBean.getData().getSize();
+        long pages = (resultBean.getData().getTotal() + resultBean.getData().getSize() - 1) / resultBean.getData().getSize();
         page.setPages(pages);
         return rb.success().setData(page);
     }
@@ -617,7 +626,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
                 for (int i = 0; i < integers.size(); i++) {
                     Integer integer = integers.get(i);
                     String path = fileUploadComponent.getUrlPrefix();
-                    voList.get(integer).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl());
+                    voList.get(integer).getAppVariables().setPath(path + appSubsetVersions.getUpdateUrl());
                     voList.get(integer).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode());
                     voList.get(integer).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName());
                 }
@@ -627,7 +636,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         page.setCurrent(resultBean.getData().getCurrent());
         page.setSize(resultBean.getData().getSize());
         page.setTotal(resultBean.getData().getTotal());
-        long pages = (resultBean.getData().getTotal() + resultBean.getData().getSize() -1) / resultBean.getData().getSize();
+        long pages = (resultBean.getData().getTotal() + resultBean.getData().getSize() - 1) / resultBean.getData().getSize();
         page.setPages(pages);
         return rb.success().setData(page);
     }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@@ -14,6 +14,7 @@ import com.yxt.anrui.portal.biz.flow.FlowableService;
 import com.yxt.anrui.portal.biz.formnotice.FormNoticeService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
 import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoFeign;
+import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoQuery;
 import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.DateUtils;
@@ -147,7 +148,7 @@ public class AppIndexRest implements AppIndexFeign {
     }
 
     @Override
-    public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid,String orgPath) {
+    public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid, String orgPath) {
         ResultBean<List<AppIndexAppNumVo>> rb = ResultBean.fireFail();
         String linkSid = LINKSID;
         List<AppIndexAppNumVo> appIndexAppNumVos = appSubsetVersionService.selectAppNum(linkSid);
@@ -155,12 +156,15 @@ public class AppIndexRest implements AppIndexFeign {
             if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) {
                 //供应链
                 ResultBean<AppScmBaseInfoVo> indexCountVo = ResultBean.fireFail();
-                if(StringUtils.isBlank(orgPath)){
+                if (StringUtils.isBlank(orgPath)) {
                     indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid);
-                }else{
-                    indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid,orgPath);
+                } else {
+                    //切换机构
+                    AppScmBaseInfoQuery appScmBaseInfoQuery = new AppScmBaseInfoQuery();
+                    appScmBaseInfoQuery.setOrgPath(orgPath);
+                    appScmBaseInfoQuery.setUserSid(userSid);
+                    indexCountVo = appScmBaseInfoFeign.getToDoNum(appScmBaseInfoQuery);
                 }
-//                ResultBean<AppScmBaseInfoVo> indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid);
                 int count = 0;
                 if (indexCountVo.getSuccess()) {
                     AppScmBaseInfoVo appScmBaseInfoVo = indexCountVo.getData();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -706,7 +706,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
                     }
                 }
             }else{
-                orgSid = params.getOrgPath();
+                String orgPath = params.getOrgPath();
+                orgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData();
             }
 
             if (StringUtils.isNotBlank(params.getName())) {

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

@@ -83,7 +83,7 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     @Select("select * from sys_staff_org where staffSid=#{staffSid} AND manageType != 2")
     SysStaffOrg selectAllByStaffSid(String staffSid);
 
-    @Select("select * from sys_staff_org where staffSid=#{sid} order by id limit 1")
+    @Select("select * from sys_staff_org where staffSid=#{sid} and manageType = '3' order by id limit 1")
     SysStaffOrg getOrgByStaffSid(String sid);
 
     @Select("select * from sys_staff_org where staffSid=#{sid} and orgSidPath = #{path} ")

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

@@ -62,7 +62,7 @@
     <select id="selectBySidPathByStaffSid" resultType="java.lang.String">
         select orgSid
         from anrui_portal.sys_staff_org
-        where staffSid = #{applySid}
+        where staffSid = #{applySid} and manageType = '3'
         order by id desc
         limit 1
     </select>
@@ -106,6 +106,6 @@
     </select>
 
     <select id="selectOrgBySid" resultType="com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg">
-        select * from sys_staff_org sso where find_in_set(#{orgPath}, replace(sso.orgSidPath, '/', ',')) and sso.staffSid = #{staffSid}
+        select * from sys_staff_org sso where sso.orgSidPath=#{orgPath} and sso.staffSid = #{staffSid}
     </select>
 </mapper>

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

@@ -130,6 +130,11 @@ public class SysStaffOrgRest implements SysStaffOrgFeign {
         return rb.success().setData(sysStaffOrg);
     }
 
+    @Override
+    public ResultBean<String> getOrgSidByPath(String orgPath) {
+        return sysStaffOrgService.getOrgSidByPath(orgPath);
+    }
+
     @Override
     public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
         return sysStaffOrgService.selectAllByStaffSid(staffSid);

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

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -156,8 +157,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         return baseMapper.selectByStaff(sid, orgSid);
     }
 
-    public SysStaffOrgDetailsVo selectByStaffByType(String sid, String orgSid,String type) {
-        return baseMapper.selectByStaffByType(sid, orgSid,type);
+    public SysStaffOrgDetailsVo selectByStaffByType(String sid, String orgSid, String type) {
+        return baseMapper.selectByStaffByType(sid, orgSid, type);
     }
 
     public List<SysStaffOrgVo> getSysStaffOrgListByStaffSid(String staffSid) {
@@ -203,7 +204,7 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         ResultBean<String> rb = ResultBean.fireFail();
         String orgSid = baseMapper.selectBySidPathByStaffSid(applySid);
         String orgPathSid = "";
-        if (StringUtils.isNotBlank(orgSid)){
+        if (StringUtils.isNotBlank(orgSid)) {
             orgPathSid = getOrgByOrgSid(orgSid);
         }
         return rb.success().setData(orgPathSid);
@@ -219,8 +220,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         return baseMapper.getOrgByStaffSid(sid);
     }
 
-    public SysStaffOrg getOrgByStaffSidAndPath(String sid,String path) {
-        return baseMapper.getOrgByStaffSidAndPath(sid,path);
+    public SysStaffOrg getOrgByStaffSidAndPath(String sid, String path) {
+        return baseMapper.getOrgByStaffSidAndPath(sid, path);
     }
 
     public List<SysStaffOrg> getOrgByStaffSidList(String sid) {
@@ -261,17 +262,18 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
 
     /**
      * 查询该组织中是否存在该人员的该种类型关系
-     * @param sid 组织机构sid
+     *
+     * @param sid        组织机构sid
      * @param zgStaffSid 人员sid
-     * @param type 主管、分管、员工
+     * @param type       主管、分管、员工
      * @return
      */
     public int selectByStaffAndOrg(String sid, String zgStaffSid, String type) {
-        return baseMapper.selectByStaffAndOrg(sid,zgStaffSid,type);
+        return baseMapper.selectByStaffAndOrg(sid, zgStaffSid, type);
     }
 
     public int deleteByStaffSidAndType(String orgSid, String zgStaffSid, String type) {
-        return baseMapper.deleteByStaffSidAndType(orgSid,zgStaffSid,type);
+        return baseMapper.deleteByStaffSidAndType(orgSid, zgStaffSid, type);
     }
 
     public List<SysStaffOrgVo> selectByStaffS(String staffSid) {
@@ -287,6 +289,15 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
     }
 
     public List<SysStaffOrg> selectOrgBySid(String orgPath, String staffSid) {
-        return baseMapper.selectOrgBySid(orgPath,staffSid);
+        return baseMapper.selectOrgBySid(orgPath, staffSid);
+    }
+
+    public ResultBean<String> getOrgSidByPath(String orgPath) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //根据用户全路径获取分公司sid
+        List<String> stringList = Arrays.asList(orgPath.split("/"));
+        String orgSid = stringList.get(stringList.size() - 1);
+        orgPath = sysOrganizationService.getOrgSid(orgSid);
+        return rb.success().setData(orgPath);
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java

@@ -60,5 +60,5 @@ public interface SysStaffPostMapper extends BaseMapper<SysStaffPost> {
 
     String selectPost(String sid);
 
-    List<String> getPost(String userSid);
+    List<String> getPost(String staffSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml

@@ -53,9 +53,8 @@
 
     <select id="getPost" resultType="java.lang.String">
         select sp.name
-        from sys_user_role sur
-                 left join sys_role sr on sur.roleSid = sr.sid
-                 left join sys_post sp on sr.postSid = sp.sid
-        where sur.userSid = #{userSid}
+        from sys_staff_post ssp
+                 left join sys_post sp on ssp.postSid = sp.sid
+        where ssp.staffSid = #{staffSid}
     </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostService.java

@@ -136,7 +136,7 @@ public class SysStaffPostService extends MybatisBaseService<SysStaffPostMapper,
         return baseMapper.selectPost(sid);
     }
 
-    public List<String> getPost(String userSid) {
-        return baseMapper.getPost(userSid);
+    public List<String> getPost(String staffSid) {
+        return baseMapper.getPost(staffSid);
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -232,7 +232,7 @@
     </select>
 
     <select id="getUserByRole" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
-        select si.name, su.sid, su.staffSid
+        select si.name, su.sid, su.staffSid,so.orgSidPath
         from sys_user_role sr
                  left join sys_user su on sr.userSid = su.sid
                  left join sys_staffinfo si on si.sid = su.staffSid

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -316,6 +316,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         userInfoOneVo.setSid(user.getSid());
         userInfoOneVo.setUserName(user.getUserName());
         userInfoOneVo.setIsAdmin(user.getIsAdmin());
+        //类型为员工的组织机构信息
         SysStaffOrg sysStaffOrg = sysStaffOrgService.selectAllByStaffSid(user.getStaffSid()).getData();
         if (sysStaffOrg == null) {
             return null;
@@ -338,8 +339,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 userInfoOneVo.setName(staffVo.getName());
                 userInfoOneVo.setMobile(staffVo.getMobile());
                 userInfoOneVo.setStaffSid(staffVo.getSid());
-                userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
-                userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
+//                userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
+//                userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
 
             }
             // 尚无单位人员，没有单位和部门信息
@@ -354,6 +355,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 userInfoOneVo.setPostSid(staffPostDetailsVo.getPostSid());
                 userInfoOneVo.setPostName(staffPostDetailsVo.getName());
                 if (orgVoList.size() > 0) {
+                    //类型为员工的组织机构信息
                     SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0);
                     userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName());
                     userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid());
@@ -368,15 +370,16 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                     userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
                     userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
                     //根据orgSidPath查询分公司sid=====
-                    String orgSid = sysStaffOrgService.getOrgByOrgSid(sysStaffOrgVo.getOrgSid());
+                    userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath());
+                    userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath());
+                   /* String orgSid = sysStaffOrgService.getOrgByOrgSid(sysStaffOrgVo.getOrgSid());
                     SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
                     if (sysOrganization != null) {
                         userInfoOneVo.setDefaultOrgPathName(sysOrganization.getName());
-//                        userInfoOneVo.setDefaultOrgPath(sysStaffOrgVo.getOrgSidPath());
                         userInfoOneVo.setDefaultOrgPath(sysOrganization.getSid());
                     } else {
                         userInfoOneVo.setDefaultOrgPathName("暂无组织机构");
-                    }
+                    }*/
                 }
             }
         }
@@ -390,15 +393,16 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (sysStaffOrgVos.size() > 0) {
             for (SysStaffOrgVo vv : sysStaffOrgVos) {
                 OrgList orgList1 = new OrgList();
-                String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+                /*String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
                 SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
                 if (sysOrganization != null) {
                     orgList1.setOrgName(sysOrganization.getName());
-//                    orgList1.setOrgPath(vv.getOrgSidPath());
                     orgList1.setOrgPath(sysOrganization.getSid());
                 } else {
                     continue;
-                }
+                }*/
+                orgList1.setOrgPath(vv.getOrgSidPath());
+                orgList1.setOrgName(vv.getOrgNamePath());
                 orgList.add(orgList1);
             }
         }
@@ -980,24 +984,20 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (StringUtils.isBlank(query.getRoleSid())) {
             return rb.setMsg("角色sid不能为空");
         }
-        if (StringUtils.isBlank(query.getOrgPath())) {
-            if (StringUtils.isBlank(query.getOrgSidPath())) {
-                return rb.setMsg("机构全路径不能为空");
+        if (StringUtils.isBlank(query.getOrgSidPath())) {
+            return rb.setMsg("机构全路径不能为空");
+        }
+        //根据角色sid获取角色的层级
+        String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid());
+        if (StringUtils.isNotBlank(levelTypeKey)) {
+            if (query.getOrgSidPath().split("/").length >= Integer.parseInt(levelTypeKey) - 1) {
+                String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1];
+                sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid);
             }
-            //根据角色sid获取角色的层级
-            String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid());
-            if (StringUtils.isNotBlank(levelTypeKey)) {
-                if (query.getOrgSidPath().split("/").length >= Integer.parseInt(levelTypeKey) - 1) {
-                    String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1];
-                    sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid);
-                }
-                sysUserVoList.removeAll(Collections.singleton(null));
+            sysUserVoList.removeAll(Collections.singleton(null));
 
-            } else {
-                return rb.setMsg("该角色层级未设置");
-            }
         } else {
-            sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), query.getOrgPath());
+            return rb.setMsg("该角色层级未设置");
         }
 
         return rb.success().setData(sysUserVoList);
@@ -1125,7 +1125,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         return sysStaffOrgService.selectOrgBySid(orgPath, staffSid);
     }
 
-    public List<String> getPost(String userSid) {
-        return sysStaffPostService.getPost(userSid);
+    public List<String> getPost(String staffSid) {
+        return sysStaffPostService.getPost(staffSid);
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java

@@ -11,6 +11,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppMySysUserInfo;
 import com.yxt.anrui.portal.api.sysuser.app.AppSysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.app.MyInfoQuery;
 import com.yxt.anrui.portal.biz.sysexceptionlog.SysExceptionLogService;
 import com.yxt.anrui.portal.biz.systemlog.SystemLogService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
@@ -25,10 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description
@@ -280,8 +278,10 @@ public class AppSysUserRest implements AppSysUserFeign {
     }
 
     @Override
-    public ResultBean getMyInfo(String userSid, String orgPath) {
+    public ResultBean getMyInfo(MyInfoQuery myInfoQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String userSid = myInfoQuery.getUserSid();
+        String orgPath = myInfoQuery.getOrgPath();
         SysUserVo sysUserVo = sysUserService.fetchBySidVo(userSid);
         if (null == sysUserVo) rb.setMsg("信息错误");
         AppMySysUserInfo userInfo = new AppMySysUserInfo();
@@ -299,11 +299,13 @@ public class AppSysUserRest implements AppSysUserFeign {
             String orgName = s.getOrgName();
             strings.add(orgName);
         }
+        strings.removeAll(Collections.singleton(null));
         if(!strings.isEmpty()){
             userInfo.setDepartment(String.join("|",strings));
         }
         //根据用户sid查询岗位
-        List<String> stringList = sysUserService.getPost(userSid);
+        List<String> stringList = sysUserService.getPost(sysUserVo.getStaffSid());
+        stringList.removeAll(Collections.singleton(null));
         if(!stringList.isEmpty()){
             userInfo.setPosition(String.join("|",stringList));
         }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java

@@ -25,12 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
 
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -79,7 +81,7 @@ public interface ScmVehicleEnterlibraryFeign {
     @ResponseBody
     public ResultBean<PagerVo<ScmVehicleEnterlibraryPageVo>> selectCarWarehousingList(@RequestBody PagerQuery<ScmVehicleEnterlibraryPageQuery> pq);
 
-    @ApiOperation("手机端-获取车辆入库列表")
+    @ApiOperation("手机端-获取车辆入库列表：已添加切换机构")
     @PostMapping("/getCarWarehousingList")
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehicleEnterlibraryPageVo>> getCarWarehousingList(@RequestBody PagerQuery<AppScmVehicleEnterlibraryPageQuery> pq);
@@ -105,8 +107,8 @@ public interface ScmVehicleEnterlibraryFeign {
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
-    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @GetMapping("/getToDoNum")
     @ResponseBody
-    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    public ResultBean<String> getToDoNum(@SpringQueryMap AppToDoNumQuery appToDoNumQuery);
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java

@@ -25,15 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
 
-import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto;
-import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleEnterlibraryFeignFallback.java <br/>
@@ -103,7 +100,7 @@ public class ScmVehicleEnterlibraryFeignFallback implements ScmVehicleEnterlibra
 	}
 
 	@Override
-	public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+	public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
 		return null;
 	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppToDoNumQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 15:59
+ * @Description
+ */
+@Data
+public class AppToDoNumQuery{
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java

@@ -31,6 +31,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -104,7 +105,7 @@ public interface ScmVehicleExamineFeign {
     @ResponseBody
     public ResultBean saveCarInspectedInfo(@RequestBody AppScmVehicleExamineDto dto);
 
-    @ApiOperation("手机端-通过验车单")
+    @ApiOperation("手机端-通过验车单：已添加切换机构")
     @PostMapping("/submitCarInspectedInfo")
     @ResponseBody
     public ResultBean submitCarInspectedInfo(@RequestBody AppScmVehicleExamineSubmitDto dto);
@@ -114,8 +115,8 @@ public interface ScmVehicleExamineFeign {
     @ResponseBody
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
-    @ApiOperation("手机端-查询本分公司下代办数量")
-    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum")
     @ResponseBody
-    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    public ResultBean<String> getToDoNum(@SpringQueryMap AppToDoNumQuery appToDoNumQuery);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java

@@ -109,7 +109,7 @@ public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign {
 	}
 
 	@Override
-	public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+	public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
 		return null;
 	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java

@@ -25,14 +25,16 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehiclegression;
 
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -96,12 +98,12 @@ public interface ScmVehicleGressionFeign {
     @ResponseBody
     public ResultBean deleteBySids(@RequestBody String[] sids);
 
-    @ApiOperation("手机端-获取车辆移位列表")
+    @ApiOperation("手机端-获取车辆移位列表：已添加切换机构")
     @PostMapping("/getCarTransferList")
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehicleGressionPageVo>> getCarTransferList(@Valid @RequestBody PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery);
 
-    @ApiOperation("移动端、PC端-保存车库移库信息")
+    @ApiOperation("移动端、PC端-保存车库移库信息：已添加切换机构")
     @PostMapping("/saveCarTransferInfo")
     @ResponseBody
     public ResultBean<String> saveCarTransferInfo(@Valid @RequestBody AppScmVehicleGressionDto dto);
@@ -142,10 +144,10 @@ public interface ScmVehicleGressionFeign {
     @ResponseBody
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
-    @ApiOperation("手机端-查询本分公司下代办数量")
-    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum")
     @ResponseBody
-    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    public ResultBean<String> getToDoNum(@SpringQueryMap AppToDoNumQuery appToDoNumQuery);
 
     @ApiOperation("手机端-获取保险、临牌状态")
     @GetMapping("/getErtraState/{sid}/{userSid}")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehiclegression;
 
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -133,7 +134,7 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign
     }
 
     @Override
-    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
         return null;
     }
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/ScmCarTransferCompleteDto.java

@@ -14,6 +14,7 @@ public class ScmCarTransferCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "用户全路径不能为空")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
      @NotBlank(message = "参数错误：taskDefKey")
@@ -30,7 +31,7 @@ public class ScmCarTransferCompleteDto implements Dto {
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
 
-    private String orgPath;
+//    private String orgPath;
 
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java

@@ -25,12 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehicleinventory;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -84,7 +86,7 @@ public interface ScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean<ScmVehicleInventoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
-    @ApiOperation("手机端-获取盘库记录列表")
+    @ApiOperation("手机端-获取盘库记录列表：已添加切换机构")
     @PostMapping("/getCarInventoryList")
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> getCarInventoryList(@RequestBody PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery);
@@ -125,8 +127,8 @@ public interface ScmVehicleInventoryFeign {
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
-    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @GetMapping("/getToDoNum")
     @ResponseBody
-    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    public ResultBean<String> getToDoNum(@SpringQueryMap AppToDoNumQuery appToDoNumQuery);
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehicleinventory;
 
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -122,7 +123,7 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 	}
 
 	@Override
-	public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+	public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
 		return null;
 	}
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java

@@ -25,14 +25,16 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
 
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -97,8 +99,8 @@ public interface ScmVehiclePatrolinspectionFeign {
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
-    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @GetMapping("/getToDoNum")
     @ResponseBody
-    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    public ResultBean<String> getToDoNum(@SpringQueryMap AppToDoNumQuery appToDoNumQuery);
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
 
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -91,7 +92,7 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol
 	}
 
 	@Override
-	public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+	public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
 		return null;
 	}
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java

@@ -25,12 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
 
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -90,7 +89,7 @@ public interface ScmVehiclePatrolinspectionsheetFeign {
     @ResponseBody
     public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(@PathVariable("recordSid") String recordSid);
 
-    @ApiOperation("手机端-提交巡检操作")
+    @ApiOperation("手机端-提交巡检操作:已添加切换机构")
     @PostMapping("/saveInspection")
     @ResponseBody
     public ResultBean saveInspection(@RequestBody ScmVehiclePatrolinspectionsheetDto dto);

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowQuery.java

@@ -56,6 +56,4 @@ public class ScmVehicleReturnFlowQuery implements Query {
     @ApiModelProperty(value = "费用说明")
     private String remarks;
 
-    private String orgPath;
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 22:34
+ * @Description
+ */
+@Data
+public class AppScmVehInventorymonthInfoQuery {
+
+    private String sid;
+
+    private String userSid;
+
+    private String orgPath;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/InventoryRecordsQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 22:42
+ * @Description
+ */
+@Data
+public class InventoryRecordsQuery {
+
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java

@@ -25,18 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehinventorymonth;
 
-import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageQuery;
-import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: aaa(aaa) <br/>
  * File: ScmVehInventorymonthFeign.java <br/>
@@ -84,11 +81,11 @@ public interface ScmVehInventorymonthFeign {
     public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-生成盘库记录:切换机构")
-    @GetMapping("/getInventoryRecords/{userSid}/{orgPath}")
+    @GetMapping("/getInventoryRecords")
     @ResponseBody
-    public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    public ResultBean getInventoryRecords(@SpringQueryMap InventoryRecordsQuery inventoryRecordsQuery);
 
-    @ApiOperation("手机端-获取盘库报告列表")
+    @ApiOperation("手机端-获取盘库报告列表：已添加切换机构")
     @PostMapping("/getCarInventoryReportList")
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehInventorymonthVo>> getCarInventoryReportList(@RequestBody PagerQuery<AppScmVehInventorymonthQuery> pagerQuery);
@@ -96,5 +93,12 @@ public interface ScmVehInventorymonthFeign {
     @ApiOperation("手机端-获取盘库报告")
     @GetMapping("/getCarInventoryReport/{sid}/{userSid}")
     @ResponseBody
-    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(@PathVariable("sid") String sid,@PathVariable("userSid")String userSid);
+    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
+
+    @ApiOperation("手机端-获取盘库报告:已添加切换机构")
+    @GetMapping("/getCarInventoryReport")
+    @ResponseBody
+    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(@SpringQueryMap AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery);
+
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java

@@ -77,7 +77,7 @@ public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFe
 	}
 
 	@Override
-	public ResultBean getInventoryRecords(String userSid, String orgPath) {
+	public ResultBean getInventoryRecords(InventoryRecordsQuery inventoryRecordsQuery) {
 		return null;
 	}
 
@@ -90,4 +90,9 @@ public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFe
 	public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid,String userSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery) {
+		return null;
+	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java

@@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -80,9 +81,9 @@ public interface ScmVehPatrolinspectionmonthFeign {
     public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-判断是否生成巡检记录:切换机构")
-    @GetMapping("/getInspectionRecords/{userSid}/{orgPath}")
+    @GetMapping("/getInspectionRecords")
     @ResponseBody
-    public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    public ResultBean getInspectionRecords(@SpringQueryMap VehRecordsQuery vehRecordsQuery);
 
     @ApiOperation("手机端-获取巡检报告列表")
     @PostMapping("/getCarInspectionReportList")
@@ -92,11 +93,11 @@ public interface ScmVehPatrolinspectionmonthFeign {
     @ApiOperation("手机端-获取巡检报告")
     @GetMapping("/getCarInspectionReport/{sid}/{userSid}")
     @ResponseBody
-    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid);
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-获取巡检报告:切换组织机构")
-    @GetMapping("/getCarInspectionReport/{sid}/{userSid}/{orgPath}")
+    @GetMapping("/getCarInspectionReport")
     @ResponseBody
-    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(@SpringQueryMap VehPatrolinInfoQuery vehPatrolinInfoQuery);
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java

@@ -76,7 +76,7 @@ public class ScmVehPatrolinspectionmonthFeignFallback implements ScmVehPatrolins
 	}
 
 	@Override
-	public ResultBean getInspectionRecords(String userSid, String orgPath) {
+	public ResultBean getInspectionRecords(VehRecordsQuery vehRecordsQuery) {
 		return null;
 	}
 
@@ -91,7 +91,7 @@ public class ScmVehPatrolinspectionmonthFeignFallback implements ScmVehPatrolins
 	}
 
 	@Override
-	public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
+	public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(VehPatrolinInfoQuery vehPatrolinInfoQuery) {
 		return null;
 	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehPatrolinInfoQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 21:44
+ * @Description
+ */
+@Data
+public class VehPatrolinInfoQuery {
+
+    private String sid;
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehRecordsQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 22:03
+ * @Description
+ */
+@Data
+public class VehRecordsQuery {
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/AppScmWarehouseQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.scm.api.scmwarehouse;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 20:20
+ * @Description
+ */
+@Data
+public class AppScmWarehouseQuery{
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构")
+    private String orgPath;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -69,8 +70,8 @@ public interface ScmWarehouseFeign {
     public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(@PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-获取仓库")
-    @GetMapping(value = "/selectWarehouseByUserSid/{userSid}/{orgPath}")
-    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(@PathVariable("userSid") String userSid, @PathVariable(value = "orgPath", required = false) String orgPath);
+    @GetMapping(value = "/selectWarehouseByUserSid")
+    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(@SpringQueryMap AppScmWarehouseQuery appScmWarehouseQuery);
 
     @ApiOperation("巡检获取仓库管理人")
     @GetMapping("/selectByAddressSid/{addressSid}")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java

@@ -75,7 +75,7 @@ public class ScmWarehouseFeignFallback implements ScmWarehouseFeign {
     }
 
     @Override
-    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid,String orgPath) {
+    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(AppScmWarehouseQuery appScmWarehouseQuery) {
         return null;
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.java

@@ -78,10 +78,9 @@ public interface ScmVehicleEnterlibraryMapper extends BaseMapper<ScmVehicleEnter
      * 手机端-初始化入库单信息
      *
      * @param warehousingSid
-     * @param useOrgSid
      * @return
      */
-    AppScmVehicleEnterlibraryInfoVo getCarWarehousingInfo(@Param("warehousingSid") String warehousingSid, @Param("useOrgSid") String useOrgSid);
+    AppScmVehicleEnterlibraryInfoVo getCarWarehousingInfo(@Param("warehousingSid") String warehousingSid);
 
     /**
      * 手机端-入库详情

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml

@@ -50,7 +50,6 @@
                addressCode as location
         FROM scm_vehicle_enterlibrary
         where sid = #{warehousingSid}
-          and useOrgSid = #{useOrgSid}
     </select>
 
     <select id="getCarWarehousing"

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java

@@ -27,9 +27,7 @@ package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
-import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto;
-import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
-import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -40,8 +38,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleEnterlibraryFeignFallback.java <br/>
@@ -152,11 +148,13 @@ public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign {
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleEnterlibraryService.getToDoNum(userSid,"");
+        AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery();
+        appToDoNumQuery.setUserSid(userSid);
+        return scmVehicleEnterlibraryService.getToDoNum(appToDoNumQuery);
     }
 
     @Override
-    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
-        return scmVehicleEnterlibraryService.getToDoNum(userSid,orgPath);
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
+        return scmVehicleEnterlibraryService.getToDoNum(appToDoNumQuery);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -58,6 +58,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
@@ -243,6 +244,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
         String orgPath = params.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         params.setUseOrgSid(orgPath);
         String date = params.getDate();
@@ -292,10 +295,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
     public AppScmVehicleEnterlibraryInfoVo getCarWarehousingInfo(String warehousingSid, String userSid) {
         String type3 = "03"; // 车辆库位照片 03
         List<String> warehouseImage = new ArrayList<>();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
-        SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(data.getStaffSid()).getData();
-        AppScmVehicleEnterlibraryInfoVo vo = baseMapper.getCarWarehousingInfo(warehousingSid, useOrgSid);
+        String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid();
+        SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(staffSid).getData();
+        AppScmVehicleEnterlibraryInfoVo vo = baseMapper.getCarWarehousingInfo(warehousingSid);
         vo.setName(data1.getName());
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String date = simpleDateFormat.format(new Date());
@@ -585,10 +587,15 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
         return rb.success().setMsg("保存成功");
     }
 
-    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(orgPath)) {
+        String userSid = appToDoNumQuery.getUserSid();
+        String orgPath = appToDoNumQuery.getOrgPath();
+        if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            //切换机构
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         int count = baseMapper.getToDoNum(orgPath);
         return rb.success().setData(String.valueOf(count));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java

@@ -25,10 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehicleexamine;
 
-import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehicleexamine.*;
-import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -163,11 +161,13 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign {
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleExamineService.getToDoNum(userSid,"");
+        AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery();
+        appToDoNumQuery.setUserSid(userSid);
+        return scmVehicleExamineService.getToDoNum(appToDoNumQuery);
     }
 
     @Override
-    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
-        return scmVehicleExamineService.getToDoNum(userSid,orgPath);
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
+        return scmVehicleExamineService.getToDoNum(appToDoNumQuery);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -233,6 +233,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         String orgPath = params.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         params.setUseOrgSid(orgPath);
         String date = params.getDate();
@@ -286,7 +288,6 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         String type2 = "02"; // 验车相关照片 02
         List<String> factoryImages = new ArrayList<>();
         List<String> carInspectedImages = new ArrayList<>();
-//        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid);
         if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(vo.getPurchaseKey())) {
             vo.setEditVin(true);
@@ -564,6 +565,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         String orgName = "";
         if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath);
         if(sysOrganizationVoResultBean.getSuccess()){
@@ -572,7 +575,6 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
-//        SysOrganizationVo data1 = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData();
         String s1 = "";
         String s2 = "";
         String type1 = "01"; //厂家验车照片
@@ -699,10 +701,14 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         return rb.fail().setMsg("操作失败！");
     }
 
-    public ResultBean<String> getToDoNum(String userSid,String orgPath) {
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String userSid = appToDoNumQuery.getUserSid();
+        String orgPath = appToDoNumQuery.getOrgPath();
         if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         int count = baseMapper.getToDoNum(orgPath);
         return rb.success().setData(String.valueOf(count));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.*;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.*;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
@@ -45,7 +46,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -218,12 +221,14 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleGressionService.getToDoNum(userSid,"");
+        AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery();
+        appToDoNumQuery.setUserSid(userSid);
+        return scmVehicleGressionService.getToDoNum(appToDoNumQuery);
     }
 
     @Override
-    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
-        return scmVehicleGressionService.getToDoNum(userSid,orgPath);
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
+        return scmVehicleGressionService.getToDoNum(appToDoNumQuery);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -31,7 +31,10 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.yxt.anrui.base.api.basevehicle.*;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo;
+import com.yxt.anrui.base.api.basevehicle.VehicleGression;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
@@ -41,7 +44,6 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
-import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -60,6 +62,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.*;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeVo;
@@ -67,7 +70,6 @@ import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferTaskQuery
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.SubmitCarTransferDto;
 import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDto;
 import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
 import com.yxt.anrui.scm.biz.scmexitpermit.ScmExitPermitService;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService;
@@ -323,8 +325,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     public IPage<AppScmVehicleGressionPageVo> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) {
         String type = "05";
         IPage<AppScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        /*String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        pagerQuery.getParams().setUseOrgSid(useOrgSid);*/
         QueryWrapper<AppScmVehicleGressionPageVo> qw = appQueryWrapper(pagerQuery.getParams());
         AppScmVehicleGressionPageQuery params = pagerQuery.getParams();
         IPage<AppScmVehicleGressionPageVo> iPage = baseMapper.getCarTransferList(page, qw, params.getNames());
@@ -366,7 +366,13 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             qw.eq("svg.handleState", query.getType());
         }
         if (StringUtils.isNotBlank(query.getOrgPath())) {
-            qw.eq("svg.useOrgSid", query.getOrgPath());
+            //切换机构
+            //根据用户所在组织全路径获取分公司sid
+            String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+            qw.eq("svg.useOrgSid", orgPath);
+        } else {
+            String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+            qw.eq("svg.useOrgSid", useOrgSid);
         }
         return qw;
     }
@@ -387,9 +393,12 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String userSid = dto.getUserSid();
         String sid = dto.getSid();
         //机构sid
-        String useOrgSid = dto.getOrgPath();
-        if (StringUtils.isBlank(useOrgSid)) {
-            useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            //切换机构
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         //获取用户信息
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
@@ -407,7 +416,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             //申请时间
             scmVehicleGression.setApplicantDate(today);
             //分公司sid
-            scmVehicleGression.setUseOrgSid(useOrgSid);
+            scmVehicleGression.setUseOrgSid(orgPath);
             scmVehicleGression.setCreateBySid(userSid);
             //1待办 2已办
             scmVehicleGression.setHandleState("1");
@@ -695,7 +704,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             if (!userVoResultBean.getSuccess()) {
                 return rb.setMsg(userVoResultBean.getMsg());
             }
-            //根据staffSid获取用户的组织全路径
+            //根据staffSid获取用户的组织全路径（多组织情况下倒序取第一个）
             ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
             if (!staffOrgResultBean.getSuccess()) {
                 return rb.setMsg(staffOrgResultBean.getMsg());
@@ -705,7 +714,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             //用户的部门全路径sid
             bv.setOrgSidPath(orgSidPath);
         } else {
-            bv.setOrgPath(orgPath);
+            bv.setOrgSidPath(orgPath);
         }
 
         ScmVehicleGression scmVehicleGression = fetchBySid(dto.getSid());
@@ -875,11 +884,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(bv.getOrgPath())) {
-            if (StringUtils.isBlank(bv.getOrgSidPath())) {
-                return rb.setMsg("参数错误：orgSidPath");
-            }
-        }
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         ScmVehicleGression scmVehicleGression = fetchBySid(bv.getBusinessSid());
         Map<String, Object> variables = new HashMap<>();
@@ -1385,10 +1389,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return pdfName;
     }
 
-    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String userSid = appToDoNumQuery.getUserSid();
+        String orgPath = appToDoNumQuery.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        } else {
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         int count = baseMapper.getToDoNum(orgPath, userSid);
         return rb.success().setData(String.valueOf(count));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java

@@ -26,9 +26,8 @@
 package com.yxt.anrui.scm.biz.scmvehicleinventory;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
-import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageQuery;
-import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -165,11 +164,13 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleInventoryService.getToDoNum(userSid,"");
+        AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery();
+        appToDoNumQuery.setUserSid(userSid);
+        return scmVehicleInventoryService.getToDoNum(appToDoNumQuery);
     }
 
     @Override
-    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
-        return scmVehicleInventoryService.getToDoNum(userSid,orgPath);
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
+        return scmVehicleInventoryService.getToDoNum(appToDoNumQuery);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -32,6 +32,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo;
@@ -193,6 +194,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         String orgPath = params.getOrgPath();
         if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         AppScmVehicleCarInventoryListPageQuery paramsQuery = pagerQuery.getParams();
         params.setUseOrgSid(orgPath);
@@ -221,6 +224,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         String userSid = query.getUserSid();
         if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         if(StringUtils.isNotBlank(orgPath)){
             qw.eq("createOrgSid", orgPath);
@@ -364,8 +369,9 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         String createOrgSid = dto.getOrgPath();
         if(StringUtils.isBlank(createOrgSid)){
             createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getLoginSid()).getData();
+        }else{
+            createOrgSid = sysStaffOrgFeign.getOrgSidByPath(createOrgSid).getData();
         }
-//        String createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getLoginSid()).getData();
         String inventorySid = dto.getInventorySid();
         String inventoryName = dto.getInventoryName();
         String inventoryStateKey = dto.getInventoryStateKey();
@@ -376,10 +382,6 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
             return rb.setMsg("备注请填写盘损原因");
         }
-//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-//        if (simpleDateFormat.format(new Date()).equals(dto.getLastData())) {
-//            return rb.setMsg("今日已盘车辆，请勿重复提交");
-//        }
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
             BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
@@ -575,10 +577,14 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         return rb.success().setMsg("修改保存成功");
     }
 
-    public ResultBean<String> getToDoNum(String userSid,String orgPath) {
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String orgPath = appToDoNumQuery.getOrgPath();
+        String userSid = appToDoNumQuery.getUserSid();
         if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         int count = baseMapper.getInventoryState(orgPath);
         return rb.success().setData(String.valueOf(count));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
@@ -128,11 +129,13 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehiclePatrolinspectionService.getToDoNum(userSid,"");
+        AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery();
+        appToDoNumQuery.setUserSid(userSid);
+        return scmVehiclePatrolinspectionService.getToDoNum(appToDoNumQuery);
     }
 
     @Override
-    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
-        return scmVehiclePatrolinspectionService.getToDoNum(userSid,orgPath);
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
+        return scmVehiclePatrolinspectionService.getToDoNum(appToDoNumQuery);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -32,6 +32,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
@@ -211,6 +212,8 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         String orgPath = params.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         params.setUseOrgSid(orgPath);
         QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = new QueryWrapper<>();
@@ -260,6 +263,8 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         String orgPath = paramsQuery.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         paramsQuery.setUseOrgSid(orgPath);
         String date = paramsQuery.getDate();
@@ -357,10 +362,14 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         return baseMapper.selectByVinNo(vinNo, useOrgSid);
     }
 
-    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+    public ResultBean<String> getToDoNum(AppToDoNumQuery appToDoNumQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String orgPath = appToDoNumQuery.getOrgPath();
+        String userSid = appToDoNumQuery.getUserSid();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         int count = baseMapper.getToDoNum(orgPath);
         return rb.success().setData(String.valueOf(count));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -26,7 +26,6 @@
 package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
@@ -40,6 +39,7 @@ import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspe
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo;
+import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehRecordsQuery;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
@@ -49,19 +49,15 @@ import com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionm
 import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.JPushServer;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.AppMessageDto;
 import com.yxt.messagecenter.api.message.AppScmMessageFlowableQuery;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MsgTargetUriEnum;
-import com.yxt.messagecenter.api.messagelist.MessageListDto;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
-import com.yxt.messagecenter.api.messagetype.MessageTypeVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -74,9 +70,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 /**
  * Project: anrui_scm(anrui_scm) <br/>
@@ -250,10 +243,9 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
-//        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-//        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
 
         int counts = baseMapper.selectByMainSidAndVinNo(dto.getMainSid(), dto.getVinNo());
         if (counts > 0) {
@@ -269,7 +261,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             if (monthVoList.size() > 0) {
                 scmVehPatrolinspectionmonthVo = monthVoList.get(0);
             } else {
-                scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid(),orgPath);
+                VehRecordsQuery vehRecordsQuery = new VehRecordsQuery();
+                vehRecordsQuery.setUserSid(dto.getUserSid());
+                vehRecordsQuery.setOrgPath(orgPath);
+                scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery);
                 monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
                 scmVehPatrolinspectionmonthVo = monthVoList.get(0);
             }
@@ -417,8 +412,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         }else{
             useOrgSid = orgPath;
         }
+        VehRecordsQuery vehRecordsQuery = new VehRecordsQuery();
+        vehRecordsQuery.setOrgPath(orgPath);
+        vehRecordsQuery.setUserSid(dto.getUserSid());
         ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
-//        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         //查询是否有月度巡检记录
         List<ScmVehPatrolinspectionmonthVo> monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
@@ -433,14 +430,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
 
             } else if (scmVehPatrolinspectionmonthVo.getState() == 1) {
                 // 是 先生成月度巡检 和 巡检记录
-                scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid(),orgPath);
+                scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery);
                 monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
                 scmVehPatrolinspectionmonthVo = monthVoList.get(0);
 
             }
         } else { // 否 先生成月度巡检 和 巡检记录
 
-            scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid(),orgPath);
+            scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery);
             monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
             scmVehPatrolinspectionmonthVo = monthVoList.get(0);
 
@@ -616,6 +613,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String orgPath = dto.getOrgPath();
         if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         String mainSid = dto.getMainSid();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -346,11 +346,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        if(StringUtils.isBlank(bv.getOrgPath())){
-            if(StringUtils.isBlank(bv.getOrgSidPath())){
-                return rb.setMsg("参数错误：orgSidPath");
-            }
-        }
         //查询对象转换为map集合
         boolean isTrue = isTrue(bv.getBusinessSid());
         if (isTrue) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java

@@ -26,9 +26,7 @@ package com.yxt.anrui.scm.biz.scmvehinventorymonth; /***************************
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
-import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -39,8 +37,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: aaa(aaa) <br/>
  * File: ScmVehInventorymonthFeignFallback.java <br/>
@@ -100,12 +96,14 @@ public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign {
 
     @Override
     public ResultBean getInventoryRecords(String userSid) {
-        return scmVehInventorymonthService.getInventoryRecords(userSid, "");
+        InventoryRecordsQuery inventoryRecordsQuery = new InventoryRecordsQuery();
+        inventoryRecordsQuery.setUserSid(userSid);
+        return scmVehInventorymonthService.getInventoryRecords(inventoryRecordsQuery);
     }
 
     @Override
-    public ResultBean getInventoryRecords(String userSid, String orgPath) {
-        return scmVehInventorymonthService.getInventoryRecords(userSid, orgPath);
+    public ResultBean getInventoryRecords(InventoryRecordsQuery inventoryRecordsQuery) {
+        return scmVehInventorymonthService.getInventoryRecords(inventoryRecordsQuery);
     }
 
     @Override
@@ -121,6 +119,14 @@ public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign {
 
     @Override
     public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid, String userSid) {
-        return scmVehInventorymonthService.getCarInventoryReport(sid, userSid);
+        AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery = new AppScmVehInventorymonthInfoQuery();
+        appScmVehInventorymonthInfoQuery.setSid(sid);
+        appScmVehInventorymonthInfoQuery.setUserSid(userSid);
+        return scmVehInventorymonthService.getCarInventoryReport(appScmVehInventorymonthInfoQuery);
+    }
+
+    @Override
+    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery) {
+        return scmVehInventorymonthService.getCarInventoryReport(appScmVehInventorymonthInfoQuery);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -168,8 +168,10 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean getInventoryRecords(String userSid, String orgPath) {
+    public ResultBean getInventoryRecords(InventoryRecordsQuery inventoryRecordsQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String userSid = inventoryRecordsQuery.getUserSid();
+        String orgPath = inventoryRecordsQuery.getOrgPath();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         String orgName = "";
         if (StringUtils.isBlank(orgPath)) {
@@ -177,6 +179,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
             orgName = sysStaffOrg.getOrgName();
         } else {
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
             ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath);
             if (organizationVoResultBean.getSuccess()) {
                 SysOrganizationVo sysOrganizationVo = organizationVoResultBean.getData();
@@ -250,6 +253,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         String orgPath = paramsQuery.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         paramsQuery.setUseOrgSid(orgPath);
         String date = paramsQuery.getDate();
@@ -294,9 +299,17 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         return iPage;
     }
 
-    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid, String userSid) {
+    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery) {
         ResultBean<AppScmVehInventorymonthInfoVo> rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        String sid = appScmVehInventorymonthInfoQuery.getSid();
+        String userSid = appScmVehInventorymonthInfoQuery.getUserSid();
+        String orgPath = appScmVehInventorymonthInfoQuery.getOrgPath();
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        }
+//        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppScmVehInventorymonthInfoVo vo = new AppScmVehInventorymonthInfoVo();
         AppScmVehInventorymonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid);
         List<RecipientListVo> recipientListVos = scmVehInventoryreportService.selectByMainSid(userSid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java

@@ -26,37 +26,30 @@
 package com.yxt.anrui.scm.biz.scmvehinventoryreport;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoQuery;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo;
 import com.yxt.anrui.scm.api.scmvehinventoryreport.*;
 import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.JPushServer;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.AppMessageDto;
 import com.yxt.messagecenter.api.message.AppScmMessageFlowableQuery;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MsgTargetUriEnum;
-import com.yxt.messagecenter.api.messagelist.MessageListDto;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
-import com.yxt.messagecenter.api.messagetype.MessageTypeVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 /**
  * Project: aaa(aaa) <br/>
@@ -142,7 +135,10 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         ScmVehInventoryreport scmVehInventoryreport = new ScmVehInventoryreport();
         BeanUtil.copyProperties(dto, scmVehInventoryreport, "sid");
-        AppScmVehInventorymonthInfoVo data = scmVehInventorymonthService.getCarInventoryReport(dto.getMainSid(), dto.getUserSid()).getData();
+        AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery = new AppScmVehInventorymonthInfoQuery();
+        appScmVehInventorymonthInfoQuery.setSid(dto.getMainSid());
+        appScmVehInventorymonthInfoQuery.setUserSid(dto.getUserSid());
+        AppScmVehInventorymonthInfoVo data = scmVehInventorymonthService.getCarInventoryReport(appScmVehInventorymonthInfoQuery).getData();
         scmVehInventoryreport.setReportContent(data.getProfitRemarks() + data.getLossRemarks() + data.getDamageRemarks());
         scmVehInventorymonthService.updateByMainSid(dto.getMainSid());
         List<RecipientListDto> recipientList = dto.getRecipientList();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java

@@ -96,12 +96,14 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo
 
     @Override
     public ResultBean getInspectionRecords(String userSid) {
-        return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid,"");
+        VehRecordsQuery vehRecordsQuery = new VehRecordsQuery();
+        vehRecordsQuery.setUserSid(userSid);
+        return scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery);
     }
 
     @Override
-    public ResultBean getInspectionRecords(String userSid, String orgPath) {
-        return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid,orgPath);
+    public ResultBean getInspectionRecords(VehRecordsQuery vehRecordsQuery) {
+        return scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery);
     }
 
     @Override
@@ -117,11 +119,14 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo
 
     @Override
     public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid,String userSid) {
-        return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid,"");
+        VehPatrolinInfoQuery vehPatrolinInfoQuery = new VehPatrolinInfoQuery();
+        vehPatrolinInfoQuery.setSid(sid);
+        vehPatrolinInfoQuery.setUserSid(userSid);
+        return scmVehPatrolinspectionmonthService.getCarInspectionReport(vehPatrolinInfoQuery);
     }
 
     @Override
-    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
-        return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid,orgPath);
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(VehPatrolinInfoQuery vehPatrolinInfoQuery) {
+        return scmVehPatrolinspectionmonthService.getCarInspectionReport(vehPatrolinInfoQuery);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -178,11 +178,12 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
     /**
      * 生成待巡检记录
      *
-     * @param userSid
      */
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean getInspectionRecords(String userSid, String orgPath) {
+    public ResultBean getInspectionRecords(VehRecordsQuery vehRecordsQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String userSid = vehRecordsQuery.getUserSid();
+        String orgPath = vehRecordsQuery.getOrgPath();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         String orgName = "";
         if (StringUtils.isBlank(orgPath)) {
@@ -190,6 +191,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
             SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
             orgName = sysStaffOrg.getOrgName();
         } else {
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
             ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath);
             if (sysOrganizationVoResultBean.getSuccess()) {
                 SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
@@ -342,6 +344,8 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         String orgPath = paramsQuery.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         paramsQuery.setUseOrgSid(orgPath);
         String date = paramsQuery.getDate();
@@ -381,8 +385,11 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         return iPage;
     }
 
-    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(VehPatrolinInfoQuery vehPatrolinInfoQuery) {
         ResultBean<AppScmVehPatrolinspectionmonthInfoVo> rb = ResultBean.fireFail();
+        String sid = vehPatrolinInfoQuery.getSid();
+        String userSid = vehPatrolinInfoQuery.getUserSid();
+        String orgPath = vehPatrolinInfoQuery.getOrgPath();
         AppScmVehPatrolinspectionmonthInfoVo vo = new AppScmVehPatrolinspectionmonthInfoVo();
         AppScmVehPatrolinspectionmonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid);
         if (appScmVehInventorymonthInfoVo != null) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java

@@ -107,12 +107,14 @@ public class ScmWarehouseRest implements ScmWarehouseFeign {
 
     @Override
     public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid) {
-        return scmWarehouseService.selectWarehouseByUserSid(userSid, "");
+        AppScmWarehouseQuery appScmWarehouseQuery = new AppScmWarehouseQuery();
+        appScmWarehouseQuery.setUserSid(userSid);
+        return scmWarehouseService.selectWarehouseByUserSid(appScmWarehouseQuery);
     }
 
     @Override
-    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid, String orgPath) {
-        return scmWarehouseService.selectWarehouseByUserSid(userSid, orgPath);
+    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(AppScmWarehouseQuery appScmWarehouseQuery) {
+        return scmWarehouseService.selectWarehouseByUserSid(appScmWarehouseQuery);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -144,10 +144,14 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         return rb.success().setData(maps);
     }
 
-    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid, String orgPath) {
+    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(AppScmWarehouseQuery appScmWarehouseQuery) {
         ResultBean<List<AppScmWarehouseVo>> rb = ResultBean.fireFail();
+        String orgPath = appScmWarehouseQuery.getOrgPath();
+        String userSid = appScmWarehouseQuery.getUserSid();
         if(StringUtils.isBlank(orgPath)){
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }else{
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         List<AppScmWarehouseVo> list = baseMapper.selectWarehouseByUserSid(orgPath);
         return rb.success().setData(list);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java

@@ -53,8 +53,12 @@ public interface AppBusMainDepositFeign {
     public ResultBean<List<DepositRecordsVo>> getDepositRecords(@PathVariable("depositBillNo") String depositBillNo);
 
     @ApiOperation("根据仓库sid 获取车架号")
-    @GetMapping({"/getVinByWarehouseSid/{warehouseSid}/{userSid}","/getVinByWarehouseSid/{warehouseSid}/{userSid}/{orgPath}"})
-    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid,@PathVariable(value = "orgPath",required = false) String orgPath);
+    @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}")
+    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid);
+
+    @ApiOperation("根据仓库sid 获取车架号")
+    @GetMapping("/getVinByWarehouseSid")
+    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(@SpringQueryMap AppWarehouseVinQuery appWarehouseVinQuery);
 
     @ApiOperation("删除虚拟订单")
     @DeleteMapping("/deleteVirtualOrder/{virtualOrderSid}/{userSid}")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java

@@ -148,7 +148,12 @@ public class AppBusMainDepositFeignFallback implements AppBusMainDepositFeign {
     }
 
     @Override
-    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid,String orgPath) {
+    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(AppWarehouseVinQuery appWarehouseVinQuery) {
         return null;
     }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppWarehouseVinQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 21:19
+ * @Description
+ */
+@Data
+public class AppWarehouseVinQuery {
+    @ApiModelProperty("仓库sid")
+    private String warehouseSid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java

@@ -29,6 +29,7 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -60,9 +61,9 @@ public interface AppScmBaseInfoFeign {
     @ResponseBody
     public ResultBean<AppScmBaseInfoVo> getToDoNum(@PathVariable("userSid") String userSid);
 
-    @ApiOperation("获取供应链各业务模块待办数量")
-    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @ApiOperation("获取供应链各业务模块待办数量:切换机构")
+    @GetMapping("/getToDoNum")
     @ResponseBody
-    public ResultBean<AppScmBaseInfoVo> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(@SpringQueryMap AppScmBaseInfoQuery baseInfoQuery);
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeignFallback.java

@@ -54,7 +54,7 @@ public class AppScmBaseInfoFeignFallback implements AppScmBaseInfoFeign {
     }
 
     @Override
-    public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid, String orgPath) {
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(AppScmBaseInfoQuery baseInfoQuery) {
         return null;
     }
 }