切换机构

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

@@ -67,4 +67,8 @@ public interface BaseDiscountpackageFeign {
     @ApiOperation("移动端-销售订单获取销售政策优惠包")
     @GetMapping("/getAppPackage/{userSid}")
     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);
 }

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

@@ -66,5 +66,10 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid, String orgPath) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java

@@ -16,4 +16,7 @@ public class BaseMiddleQuery implements Query {
     private String name;
     @ApiModelProperty("参数错误：userSid不能为空")
     private String userSid;
+
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
 }

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

@@ -4,6 +4,7 @@ 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.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -357,6 +358,10 @@ public interface BaseVehicleFeign {
     @GetMapping("/getVins/{modelSid}/{configSid}/{userSid}")
     public ResultBean<List<AppVinsDetailsVo>> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid);
 
+    @ApiOperation("获取车架号")
+    @PostMapping("/getVins")
+    public ResultBean<List<AppVinsDetailsVo>> getVins(@RequestBody VinQuery vinQuery);
+
     /**
      * 2020-06-16已整理
      *

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

@@ -4,6 +4,7 @@ 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.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -258,6 +259,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppVinsDetailsVo>> getVins(VinQuery vinQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean getModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
         return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/getModelList无法访问");

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

@@ -15,4 +15,8 @@ public class InspectionVinQuery implements Query {
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 
+
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

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

@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.basevehicle.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/20 23:16
+ * @Description
+ */
+@Data
+public class VinQuery implements Query {
+    private static final long serialVersionUID = 1891967483035764368L;
+
+    private String modelSid;
+    private String configSid;
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

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

@@ -114,6 +114,10 @@ public interface BaseVehicleBrandFeign {
     @GetMapping("/selectAppListByUserSid/{userSid}")
     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);
+
     @ApiOperation("根据品牌sid获取品牌信息")
     @GetMapping("/fetchBySid/{sid}")
     BaseVehicleBrand fetchBySid(@RequestParam("sid") String sid);

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

@@ -81,6 +81,11 @@ public class BaseVehicleBrandFeignFallback implements BaseVehicleBrandFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(String userSid, String orgPath) {
+        return null;
+    }
+
     @Override
     public BaseVehicleBrand fetchBySid(String sid) {
         return null;

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

@@ -2,7 +2,6 @@ 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;
@@ -132,7 +131,12 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
 
     @Override
     public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
-        return baseDiscountpackageService.getAppPackage(userSid);
+        return baseDiscountpackageService.getAppPackage(userSid,"");
+    }
+
+    @Override
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid, String orgPath) {
+        return baseDiscountpackageService.getAppPackage(userSid,orgPath);
     }
 
 }

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

@@ -7,9 +7,7 @@ import com.yxt.anrui.base.api.basediscountpackage.*;
 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;
-import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
-import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -212,7 +210,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         variables.put("businessSid", businessSid);
         variables.put("isLoan", true);
         variables.put("orgSid", orgSid);//部门sid
-        ResultBean resultBean =null;// flowableService.businessStart(ProcDefEnum.SALESPOLICY.getProDefId(), dto.getUserSid(), variables);
+        ResultBean resultBean = null;// flowableService.businessStart(ProcDefEnum.SALESPOLICY.getProDefId(), dto.getUserSid(), variables);
         if (resultBean.getSuccess() && resultBean.getData() != null) {
             Map<String, String> map = (Map<String, String>) resultBean.getData();
             saveSysFormLink(map);
@@ -242,7 +240,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             updateMap.put("businessSid", sid);
             updateMap.put("nodeState", map.get("nodeState"));
             updateMap.put("taskDefKey", map.get("taskDefKey"));
-           // updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
+            // updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
             sysFormLinkFeign.updateFiled(updateMap);
         }
     }
@@ -318,19 +316,22 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         return qw;
     }
 
-    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid, String orgPath) {
         ResultBean<List<AppBaseDiscountpackageVo>> rb = ResultBean.fireFail();
         QueryWrapper<BaseDiscountpackage> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(userSid)) {
-            //根据申请人sid查询分公司sid
-            String orgSid = "";
-            ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
-            if (stringResultBean.getSuccess()) {
-                orgSid = stringResultBean.getData();
+        if (StringUtils.isBlank(orgPath)) {
+            if (StringUtils.isNotBlank(userSid)) {
+                //根据申请人sid查询分公司sid
+                ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+                if (stringResultBean.getSuccess()) {
+                    orgPath = stringResultBean.getData();
+                }
+                qw.lambda().apply("FIND_IN_SET ('" + orgPath + "',useOrg)");
             }
-            qw.lambda().apply("FIND_IN_SET ('" + orgSid + "',useOrg)");
-            qw.eq("salesPolicyKey", "0002");
+        } else {
+            qw.lambda().apply("FIND_IN_SET ('" + orgPath + "',useOrg)");
         }
+        qw.eq("salesPolicyKey", "0002");
         List<AppBaseDiscountpackageVo> voList = baseMapper.getAppPackage(qw);
         if (voList.isEmpty()) {
             voList = new ArrayList<>();

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

@@ -116,10 +116,15 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
         BaseMiddleQuery params = query.getParams();
         QueryWrapper<BaseMiddleman> qw = new QueryWrapper<>();
         if (params != null) {
-            if (StringUtils.isNotBlank(params.getUserSid())) {
-                ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
-                qw.eq("useOrgSid", resultBean.getData());
+            if(StringUtils.isBlank(params.getOrgPath())){
+                if (StringUtils.isNotBlank(params.getUserSid())) {
+                    ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
+                    qw.eq("useOrgSid", resultBean.getData());
+                }
+            }else{
+                qw.eq("useOrgSid", params.getOrgPath());
             }
+
         }
         IPage<BaseMiddleVo> pagging = baseMapper.getMiddleList(page, qw, params.getName());
         PagerVo<BaseMiddleVo> p = PagerUtil.pageToVo(pagging, null);

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

@@ -15,6 +15,7 @@ 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.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
@@ -866,7 +867,17 @@ public class BaseVehicleRest implements BaseVehicleFeign {
      */
     @Override
     public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid, String userSid) {
-        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid);
+        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid,"");
+        return new ResultBean<List<AppVinsDetailsVo>>().success().setData(vo);
+    }
+
+    @Override
+    public ResultBean<List<AppVinsDetailsVo>> getVins(VinQuery vinQuery) {
+        String modelSid = vinQuery.getModelSid();
+        String configSid = vinQuery.getConfigSid();
+        String userSid = vinQuery.getUserSid();
+        String orgPath = vinQuery.getOrgPath();
+        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid,orgPath);
         return new ResultBean<List<AppVinsDetailsVo>>().success().setData(vo);
     }
 

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

@@ -1060,9 +1060,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param configSid
      * @return
      */
-    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid) {
-        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid);
+    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath) {
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
+        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath);
         if (vins.size() <= 0) {
             for (AppVinsDetailsVo vin : vins) {
                 vins.add(vin);
@@ -2908,14 +2910,23 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
 
     public IPage<InspectionVinVo> getInspectionVinList(PagerQuery<InspectionVinQuery> pagerQuery) {
         IPage<AppScmVehiclePatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        InspectionVinQuery params = pagerQuery.getParams();
         QueryWrapper<InspectionVinVo> qw = new QueryWrapper<>();
-        qw.like("bv.vinNo", pagerQuery.getParams().getName());
-        qw.eq("bv.createOrgSid", pagerQuery.getParams().getUseOrgSid());
+        if (params != null) {
+            String orgPath = params.getOrgPath();
+            if (StringUtils.isBlank(orgPath)) {
+                orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+            }
+            params.setUseOrgSid(orgPath);
+            if (StringUtils.isNotBlank(params.getName())) {
+                qw.like("bv.vinNo", params.getName());
+            }
+            if (StringUtils.isNotBlank(params.getUseOrgSid())) {
+                qw.eq("bv.createOrgSid", params.getUseOrgSid());
+            }
+        }
         qw.eq("bv.isDelete", 0);
         qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
-//        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
         IPage<InspectionVinVo> iPage = baseMapper.getInspectionVinList(page, qw);
         for (InspectionVinVo record : iPage.getRecords()) {
             String addressSid = record.getAddressSid();

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

@@ -173,7 +173,13 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign {
 
     @Override
     public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(String userSid) {
-        List<BaseVehicleBrandDictionariesVo> list = baseVehicleBrandService.selectAppListByUserSid(userSid);
+        List<BaseVehicleBrandDictionariesVo> list = baseVehicleBrandService.selectAppListByUserSid(userSid,"");
+        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);
         return  new ResultBean<List<BaseVehicleBrandDictionariesVo>>().success().setData(list);
     }
 

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

@@ -222,9 +222,11 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
      * @param userSid
      * @return
      */
-    public List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(String userSid) {
-        String useOrg = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        List<BaseVehicleBrandDictionariesVo> list = baseMapper.selectAppListByUserSid(useOrg);
+    public List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(String userSid,String orgPath) {
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
+        List<BaseVehicleBrandDictionariesVo> list = baseMapper.selectAppListByUserSid(orgPath);
         return list;
     }
 

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempQuery.java

@@ -35,4 +35,7 @@ public class AppCrmCustomerTempQuery implements Query {
 	@ApiModelProperty("客户分类key")
     private String customerClassKey;
 
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

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

@@ -57,7 +57,7 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
      * @param name
      * @return
      */
-    IPage<AppCrmCustomerTempVo> getCustomerTempListByUserSid(IPage<AppCrmCustomerTempQuery> page, @Param("staffSid") String staffSid, @Param("name") String name);
+    IPage<AppCrmCustomerTempVo> getCustomerTempListByUserSid(IPage<AppCrmCustomerTempQuery> page, @Param(Constants.WRAPPER) Wrapper<CrmCustomerTemp> qw);
 
 
     CrmCustomerTempVo selectByMobileOrWx(Map<String, String> map);
@@ -73,7 +73,7 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
      * 根据客户的手机号以及当前登录者所在部门的sid查询该部门内是否有重复的
      *
      * @param staffSid 当前登录者staffSId
-     * @param mobile 手机号
+     * @param mobile   手机号
      * @return
      */
     CrmCustomerTempVo selectByMobile(@Param("staffSid") String staffSid, @Param("mobile") String mobile);

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

@@ -44,11 +44,9 @@
                cct.follow_state
         FROM crm_customer_temp cct
                  LEFT JOIN crm_visit cv ON cct.sid = cv.customerSid
-        WHERE cct.staffSid = #{staffSid}
-        <if test="name != '' and name != null">
-            AND cct.name LIKE concat('%', #{name}, '%')
-        </if>
-        order BY cct.id DESC
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectBySid" resultType="com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo">
@@ -207,7 +205,7 @@
     </select>
 
     <select id="selectCustomerList" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListVo">
-        select ct.name,ct.sid,ct.mobile,ct.customerNo
+        select ct.name, ct.sid, ct.mobile, ct.customerNo
         from crm_customer_temp ct
         where createOrgSid = #{orgSid}
           and staffSid = #{staffSid}

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

@@ -370,12 +370,28 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
      * @return
      */
     public IPage<AppCrmCustomerTempVo> getCustomerTempListByUserSid(PagerQuery<AppCrmCustomerTempQuery> pagerQuery) {
-        String userSid = pagerQuery.getParams().getUserSid();
-        String name = pagerQuery.getParams().getName();
-        //获取用户的staffSid
-        String staffSid = sysUserFeign.fetchBySid(userSid).getData().getStaffSid();
         IPage<AppCrmCustomerTempQuery> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<AppCrmCustomerTempVo> iPage = baseMapper.getCustomerTempListByUserSid(page, staffSid, name);
+        AppCrmCustomerTempQuery params = pagerQuery.getParams();
+        String userSid = params.getUserSid();
+        String name = params.getName();
+        String orgPath = params.getOrgPath();
+        QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>();
+
+        if(params != null){
+            if(StringUtils.isNotBlank(userSid)){
+                //获取用户的staffSid
+                String staffSid = sysUserFeign.fetchBySid(userSid).getData().getStaffSid();
+                qw.eq("cct.staffSid",staffSid);
+            }
+            if(StringUtils.isNotBlank(orgPath)){
+                qw.eq("cct.createOrgSid",orgPath);
+            }
+            if(StringUtils.isNotBlank(name)){
+                qw.like("cct.name",name);
+            }
+        }
+        qw.orderByDesc("cct.id");
+        IPage<AppCrmCustomerTempVo> iPage = baseMapper.getCustomerTempListByUserSid(page, qw);
         for (AppCrmCustomerTempVo record : iPage.getRecords()) {
             String urlPrefix = fileUploadComponent.getUrlPrefix();
             String customerPhoto = record.getCustomerPhoto();

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java

@@ -31,6 +31,6 @@ public interface AppIndexFeign {
     @ApiOperation(value = "App首页子应用的待办数量")
     @ResponseBody
     @GetMapping("/homeAppBadge")
-    ResultBean<List<AppIndexAppNumVo>> selectAppNum(@RequestParam("userSid")String userSid);
+    ResultBean<List<AppIndexAppNumVo>> selectAppNum(@RequestParam("userSid") String userSid, @RequestParam(value = "orgPath", required = false) String orgPath);
 
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java

@@ -24,7 +24,7 @@ public class AppIndexFeignFallBack implements AppIndexFeign {
     }
 
     @Override
-    public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid) {
+    public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid,String orgPath) {
         return null;
     }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java

@@ -16,4 +16,7 @@ public class AppSysStaffQuery implements Query {
     private String name;
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
 }

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

@@ -20,4 +20,9 @@ public class AppMySysUserInfo implements Vo {
     private String name;
     @ApiModelProperty("用户头像")
     private String headImage;
+
+    @ApiModelProperty("职位")
+    private String position;
+    @ApiModelProperty("部门")
+    private String department;
 }

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

@@ -41,6 +41,11 @@ public interface AppSysUserFeign {
     @GetMapping("/getMyInfo/{userSid}")
     public ResultBean getMyInfo(@PathVariable("userSid") String userSid);
 
+    @ApiOperation(value = "我的信息:切换机构")
+    @ResponseBody
+    @GetMapping("/getMyInfo/{userSid}/{orgPath}")
+    public ResultBean getMyInfo(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+
     @ApiOperation(value = "手机更改密码")
     @ResponseBody
     @PostMapping("/updatePassword")

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

@@ -31,6 +31,11 @@ public class AppSysUserFeignFallback implements AppSysUserFeign {
         return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
     }
 
+    @Override
+    public ResultBean getMyInfo(String userSid, String orgPath) {
+        return null;
+    }
+
     @Override
     public ResultBean updatePassword(String userSid, String appId, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) {
         return ResultBean.fireFail().setMsg("网站维护，请稍后再试");

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

@@ -147,14 +147,20 @@ public class AppIndexRest implements AppIndexFeign {
     }
 
     @Override
-    public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid) {
+    public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid,String orgPath) {
         ResultBean<List<AppIndexAppNumVo>> rb = ResultBean.fireFail();
         String linkSid = LINKSID;
         List<AppIndexAppNumVo> appIndexAppNumVos = appSubsetVersionService.selectAppNum(linkSid);
         appIndexAppNumVos.stream().forEach(item -> {
             if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) {
                 //供应链
-                ResultBean<AppScmBaseInfoVo> indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid);
+                ResultBean<AppScmBaseInfoVo> indexCountVo = ResultBean.fireFail();
+                if(StringUtils.isBlank(orgPath)){
+                    indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid);
+                }else{
+                    indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid,orgPath);
+                }
+//                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/SysStaffinfoMapper.xml

@@ -352,6 +352,7 @@
                   , ','))
             </if>
         </where>
+        group by su.sid
     </select>
 
     <select id="getGressionUserList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo">

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

@@ -698,12 +698,17 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         QueryWrapper<AppSysStaffVo> qw = new QueryWrapper<>();
         String orgSid = "";
         if (params != null) {
-            if (StringUtils.isNotBlank(params.getUserSid())) {
-                ResultBean<String> stringResultBean = sysStaffOrgService.getPathSidByUserSid(params.getUserSid());
-                if (stringResultBean.getSuccess()) {
-                    orgSid = stringResultBean.getData();
+            if(StringUtils.isBlank(params.getOrgPath())){
+                if (StringUtils.isNotBlank(params.getUserSid())) {
+                    ResultBean<String> stringResultBean = sysStaffOrgService.getPathSidByUserSid(params.getUserSid());
+                    if (stringResultBean.getSuccess()) {
+                        orgSid = stringResultBean.getData();
+                    }
                 }
+            }else{
+                orgSid = params.getOrgPath();
             }
+
             if (StringUtils.isNotBlank(params.getName())) {
                 qw.like("si.name", params.getName());
             }

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

@@ -104,4 +104,6 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     List<String> selectByOrgSid(String sid);
 
     String selectByUserSid(String userSid);
+
+    List<SysStaffOrg> selectOrgBySid(@Param("orgPath") String orgPath, @Param("staffSid") String staffSid);
 }

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

@@ -104,4 +104,8 @@
         where so.manageType = '3'
           and su.sid = #{userSid}
     </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>
 </mapper>

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

@@ -285,4 +285,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
     public String selectByUserSid(String userSid) {
         return baseMapper.selectByUserSid(userSid);
     }
+
+    public List<SysStaffOrg> selectOrgBySid(String orgPath, String staffSid) {
+        return baseMapper.selectOrgBySid(orgPath,staffSid);
+    }
 }

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

@@ -59,4 +59,6 @@ public interface SysStaffPostMapper extends BaseMapper<SysStaffPost> {
     SysStaffPostDetailsVo getPostByStaffSid(String sid);
 
     String selectPost(String sid);
+
+    List<String> getPost(String userSid);
 }

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

@@ -50,4 +50,12 @@
                  left join sys_role sr on sp.parentSid = sr.postSid
         where ssp.staffSid = #{sid}
     </select>
+
+    <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}
+    </select>
 </mapper>

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

@@ -135,4 +135,8 @@ public class SysStaffPostService extends MybatisBaseService<SysStaffPostMapper,
     public String selecctPost(String sid) {
         return baseMapper.selectPost(sid);
     }
+
+    public List<String> getPost(String userSid) {
+        return baseMapper.getPost(userSid);
+    }
 }

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

@@ -1117,4 +1117,12 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         }
         return rb.success().setData(isTrue);
     }
+
+    public List<SysStaffOrg> selectOrgBySid(String orgPath, String staffSid) {
+        return sysStaffOrgService.selectOrgBySid(orgPath,staffSid);
+    }
+
+    public List<String> getPost(String userSid) {
+        return sysStaffPostService.getPost(userSid);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.yxt.anrui.portal.api.sysexceptionlog.SysExceptionLog;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.systemlog.SystemLog;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserQuery;
@@ -18,14 +19,15 @@ import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.*;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 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;
 
 /**
@@ -277,6 +279,37 @@ public class AppSysUserRest implements AppSysUserFeign {
         return new ResultBean().success().setData(userInfo);
     }
 
+    @Override
+    public ResultBean getMyInfo(String userSid, String orgPath) {
+        ResultBean rb = ResultBean.fireFail();
+        SysUserVo sysUserVo = sysUserService.fetchBySidVo(userSid);
+        if (null == sysUserVo) rb.setMsg("信息错误");
+        AppMySysUserInfo userInfo = new AppMySysUserInfo();
+        String headImage = "";
+        if (StringUtils.isNotBlank(sysUserVo.getHeadImage())) {
+            headImage = fileUploadComponent.getUrlPrefix() + sysUserVo.getHeadImage();
+        }
+        userInfo.setHeadImage(headImage);
+        userInfo.setName(StringUtils.isBlank(sysUserVo.getName()) ? "" : sysUserVo.getName());
+        userInfo.setId("ID：" + sysUserVo.getId());
+        //根据组织机构sid查询该用户的职位以及分公司的部门
+        List<String> strings = new ArrayList<>();
+        List<SysStaffOrg> list = sysUserService.selectOrgBySid(orgPath,sysUserVo.getStaffSid());
+        for (SysStaffOrg s : list){
+            String orgName = s.getOrgName();
+            strings.add(orgName);
+        }
+        if(!strings.isEmpty()){
+            userInfo.setDepartment(String.join("|",strings));
+        }
+        //根据用户sid查询岗位
+        List<String> stringList = sysUserService.getPost(userSid);
+        if(!stringList.isEmpty()){
+            userInfo.setPosition(String.join("|",stringList));
+        }
+        return new ResultBean().success().setData(userInfo);
+    }
+
     @Override
     public ResultBean<SysUserVo> updatePassword(String userSid, String appId, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) {
         ResultBean<SysUserVo> rb = ResultBean.fireFail();

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

@@ -25,18 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
 
-import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto;
-import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
-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.*;
 
-import java.util.List;
-
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleEnterlibraryFeign.java <br/>
@@ -108,4 +104,9 @@ public interface ScmVehicleEnterlibraryFeign {
     @ResponseBody
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+
 }

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

@@ -101,4 +101,9 @@ public class ScmVehicleEnterlibraryFeignFallback implements ScmVehicleEnterlibra
 	public ResultBean<String> getToDoNum(String userSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+		return null;
+	}
 }

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

@@ -113,4 +113,9 @@ public interface ScmVehicleExamineFeign {
     @GetMapping("/getToDoNum/{userSid}")
     @ResponseBody
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("手机端-查询本分公司下代办数量")
+    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
 }

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

@@ -107,4 +107,9 @@ public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign {
 	public ResultBean<String> getToDoNum(String userSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+		return null;
+	}
 }

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

@@ -142,6 +142,11 @@ public interface ScmVehicleGressionFeign {
     @ResponseBody
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-查询本分公司下代办数量")
+    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+
     @ApiOperation("手机端-获取保险、临牌状态")
     @GetMapping("/getErtraState/{sid}/{userSid}")
     @ResponseBody

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

@@ -132,6 +132,11 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign
         return null;
     }
 
+    @Override
+    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+        return null;
+    }
+
     @Override
     public ResultBean<AppErtraStateVo> getErtraState(String sid, String userSid) {
         return null;

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

@@ -37,4 +37,7 @@ public class AppScmVehicleCarInventoryListPageQuery implements Query {
     @ApiModelProperty("使用组织分公司sid")
     private String useOrgSid;
 
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

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

@@ -110,4 +110,6 @@ public class AppScmVehicleStayInventoryDto implements Dto {
     @ApiModelProperty("定位经纬度")
     private String addressCode;
 
+    private String orgPath;
+
 }

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

@@ -124,4 +124,9 @@ public interface ScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+
 }

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

@@ -121,4 +121,9 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+		return null;
+	}
+
 }

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

@@ -38,4 +38,7 @@ public class AppScmVehiclePatrolinspectionPageQuery implements Query {
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

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

@@ -96,4 +96,9 @@ public interface ScmVehiclePatrolinspectionFeign {
     @ResponseBody
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+
 }

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

@@ -90,4 +90,9 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+		return null;
+	}
+
 }

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

@@ -63,4 +63,6 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo {
 
     @ApiModelProperty("存放地点")
     private String warehouse;
+
+    private String orgPath;
 }

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

@@ -26,9 +26,7 @@
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
 
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -102,4 +100,7 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
     private String warehouse;
     @ApiModelProperty("推送状态 0 未推送 1 已推送")
     private int pushState;
+
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppScmVehicleStayPatrolinspectionPageQuery implements Query {
 
+    private static final long serialVersionUID = -4646685787956672629L;
     @ApiModelProperty("用户sid")
     private String userSid;
 
@@ -19,4 +20,7 @@ public class AppScmVehicleStayPatrolinspectionPageQuery implements Query {
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

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

@@ -70,4 +70,7 @@ public class AppScmVehInventorymonthQuery implements Query {
     @JsonProperty("InventEndDate")
     private String InventEndDate;
 
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

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

@@ -83,6 +83,11 @@ public interface ScmVehInventorymonthFeign {
     @ResponseBody
     public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-生成盘库记录:切换机构")
+    @GetMapping("/getInventoryRecords/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+
     @ApiOperation("手机端-获取盘库报告列表")
     @PostMapping("/getCarInventoryReportList")
     @ResponseBody

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

@@ -76,6 +76,11 @@ public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFe
 		return null;
 	}
 
+	@Override
+	public ResultBean getInventoryRecords(String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<AppScmVehInventorymonthVo>> getCarInventoryReportList(PagerQuery<AppScmVehInventorymonthQuery> pagerQuery) {
 		return null;

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

@@ -36,4 +36,7 @@ public class AppScmVehPatrolinspectionmonthQuery implements Query {
     @JsonProperty("InventEndDate")
     private String InventEndDate;
 
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

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

@@ -25,20 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
 
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthQuery;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport;
-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.*;
 
-import java.util.List;
-
 /**
  * Project: aaa(aaa) <br/>
  * File: ScmVehPatrolinspectionmonthFeign.java <br/>
@@ -85,6 +79,11 @@ public interface ScmVehPatrolinspectionmonthFeign {
     @ResponseBody
     public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-判断是否生成巡检记录:切换机构")
+    @GetMapping("/getInspectionRecords/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+
     @ApiOperation("手机端-获取巡检报告列表")
     @PostMapping("/getCarInspectionReportList")
     @ResponseBody
@@ -95,4 +94,9 @@ public interface ScmVehPatrolinspectionmonthFeign {
     @ResponseBody
     public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-获取巡检报告:切换组织机构")
+    @GetMapping("/getCarInspectionReport/{sid}/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+
 }

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

@@ -75,6 +75,11 @@ public class ScmVehPatrolinspectionmonthFeignFallback implements ScmVehPatrolins
 		return null;
 	}
 
+	@Override
+	public ResultBean getInspectionRecords(String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<AppScmVehPatrolinspectionmonthVo>> getCarInspectionReportList(PagerQuery<AppScmVehPatrolinspectionmonthQuery> pagerQuery) {
 		return null;
@@ -84,4 +89,9 @@ public class ScmVehPatrolinspectionmonthFeignFallback implements ScmVehPatrolins
 	public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid,String userSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
+		return null;
+	}
 }

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

@@ -152,6 +152,11 @@ public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign {
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleEnterlibraryService.getToDoNum(userSid);
+        return scmVehicleEnterlibraryService.getToDoNum(userSid,"");
+    }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+        return scmVehicleEnterlibraryService.getToDoNum(userSid,orgPath);
     }
 }

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

@@ -546,10 +546,12 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
         return rb.success().setMsg("保存成功");
     }
 
-    public ResultBean<String> getToDoNum(String userSid) {
+    public ResultBean<String> getToDoNum(String userSid,String orgPath) {
         ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        int count = baseMapper.getToDoNum(useOrgSid);
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).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

@@ -163,6 +163,11 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign {
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleExamineService.getToDoNum(userSid);
+        return scmVehicleExamineService.getToDoNum(userSid,"");
+    }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+        return scmVehicleExamineService.getToDoNum(userSid,orgPath);
     }
 }

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

@@ -679,10 +679,12 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         return rb.fail().setMsg("操作失败！");
     }
 
-    public ResultBean<String> getToDoNum(String userSid) {
+    public ResultBean<String> getToDoNum(String userSid,String orgPath) {
         ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        int count = baseMapper.getToDoNum(useOrgSid);
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).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

@@ -218,7 +218,12 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleGressionService.getToDoNum(userSid);
+        return scmVehicleGressionService.getToDoNum(userSid,"");
+    }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+        return scmVehicleGressionService.getToDoNum(userSid,orgPath);
     }
 
     @Override

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

@@ -1134,9 +1134,18 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 BeanUtil.copyProperties(query, flowTaskVo);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
                 if (!resultBean.getSuccess()) {
-                    return rb.setMsg("操作失败!");
+                    return rb.setMsg(resultBean.getMsg());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                scmVehicleGression = fetchBySid(query.getBusinessSid());
+                String procId = scmVehicleGression.getProcInstId();
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
+                    //清除临时车辆表状态
+                    baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
+                }
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -1172,6 +1181,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                     return rb.setMsg(resultBean.getMsg());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                //清除临时车辆表状态
+                baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -1373,10 +1384,12 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return pdfName;
     }
 
-    public ResultBean<String> getToDoNum(String userSid) {
+    public ResultBean<String> getToDoNum(String userSid,String orgPath) {
         ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        int count = baseMapper.getToDoNum(useOrgSid, userSid);
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).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

@@ -165,6 +165,11 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleInventoryService.getToDoNum(userSid);
+        return scmVehicleInventoryService.getToDoNum(userSid,"");
+    }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+        return scmVehicleInventoryService.getToDoNum(userSid,orgPath);
     }
 }

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

@@ -189,17 +189,20 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
      */
     public IPage<AppScmVehicleCarInventoryListPageVo> getCarInventoryList(PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery) {
         IPage<AppScmVehicleCarInventoryListPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams();
+        String orgPath = params.getOrgPath();
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }
         AppScmVehicleCarInventoryListPageQuery paramsQuery = pagerQuery.getParams();
-        paramsQuery.setUseOrgSid(useOrgSid);
+        params.setUseOrgSid(orgPath);
         String date = paramsQuery.getDate();
         if (StringUtils.isNotBlank(date)) {
             String[] s = date.split("至");
             paramsQuery.setInventStartDate(s[0]);
             paramsQuery.setInventEndDate(s[1]);
         }
-        QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw = appCarQueryWrapper(pagerQuery.getParams());
-        AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams();
+        QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw = appCarQueryWrapper(params);
         IPage<AppScmVehicleCarInventoryListPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getNames());
         return iPage;
     }
@@ -358,7 +361,11 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         ResultBean rb = ResultBean.fireFail();
         String s = "";
         String type = "07"; //盘库见证材料
-        String createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getLoginSid()).getData();
+        String createOrgSid = dto.getOrgPath();
+        if(StringUtils.isBlank(createOrgSid)){
+            createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getLoginSid()).getData();
+        }
+//        String createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getLoginSid()).getData();
         String inventorySid = dto.getInventorySid();
         String inventoryName = dto.getInventoryName();
         String inventoryStateKey = dto.getInventoryStateKey();
@@ -478,6 +485,9 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             patrolinspectionsheetDto.setAddress(dto.getAddress());
             patrolinspectionsheetDto.setPushState(1);
             patrolinspectionsheetDto.setImages(dto.getImages());
+            if(StringUtils.isNotBlank(dto.getOrgPath())){
+                patrolinspectionsheetDto.setOrgPath(dto.getOrgPath());
+            }
             scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
         }
         return rb.success().setMsg("保存成功");
@@ -565,10 +575,12 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         return rb.success().setMsg("修改保存成功");
     }
 
-    public ResultBean<String> getToDoNum(String userSid) {
+    public ResultBean<String> getToDoNum(String userSid,String orgPath) {
         ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        int count = baseMapper.getInventoryState(useOrgSid);
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).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

@@ -128,6 +128,11 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehiclePatrolinspectionService.getToDoNum(userSid);
+        return scmVehiclePatrolinspectionService.getToDoNum(userSid,"");
+    }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
+        return scmVehiclePatrolinspectionService.getToDoNum(userSid,orgPath);
     }
 }

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

@@ -31,11 +31,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.scmfile.ScmFileVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDetailsVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
@@ -209,22 +207,26 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
      */
     public IPage<AppScmVehicleStayPatrolinspectionPageVo> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
         IPage<AppScmVehicleStayPatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
+        String orgPath = params.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }
+        params.setUseOrgSid(orgPath);
         QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = new QueryWrapper<>();
         qw.and(wrapper -> wrapper.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001"));
         qw.eq("svp.isDelete", 0);
-        if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
-            qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
+        if (StringUtils.isNotBlank(params.getUseOrgSid())) {
+            qw.eq("svp.createOrgSid", params.getUseOrgSid());
         }
         if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
             qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid());
         }
-        AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
+
         IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
         List<AppScmVehicleStayPatrolinspectionPageVo> records = iPage.getRecords();
         for (AppScmVehicleStayPatrolinspectionPageVo record : records) {
-            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), useOrgSid);
+            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), orgPath);
             if (scmVehicleStayPatrolinspectionVos.size() > 0) {
                 for (ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo : scmVehicleStayPatrolinspectionVos) {
                     if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate() == null) {
@@ -254,9 +256,12 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
      */
     public IPage<AppScmVehiclePatrolinspectionPageVo> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
         IPage<AppScmVehiclePatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        pagerQuery.getParams().setUseOrgSid(useOrgSid);
         AppScmVehiclePatrolinspectionPageQuery paramsQuery = pagerQuery.getParams();
+        String orgPath = paramsQuery.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }
+        paramsQuery.setUseOrgSid(orgPath);
         String date = paramsQuery.getDate();
         if (StringUtils.isNotBlank(date)) {
             String[] s = date.split("至");
@@ -264,9 +269,9 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             paramsQuery.setPatrolinspectionEndDate(s[1]);
         }
         QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(pagerQuery.getParams().getState())) {
-            if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
-                qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
+        if (StringUtils.isNotBlank(paramsQuery.getState())) {
+            if (StringUtils.isNotBlank(paramsQuery.getUseOrgSid())) {
+                qw.eq("svp.createOrgSid", paramsQuery.getUseOrgSid());
             }
             if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
                 qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid());
@@ -352,10 +357,12 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         return baseMapper.selectByVinNo(vinNo, useOrgSid);
     }
 
-    public ResultBean<String> getToDoNum(String userSid) {
+    public ResultBean<String> getToDoNum(String userSid, String orgPath) {
         ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        int count = baseMapper.getToDoNum(useOrgSid);
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).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/ScmVehiclePatrolinspectionsheetMapper.xml

@@ -5,7 +5,8 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetVo">
-        SELECT * FROM scm_vehicle_patrolinspectionsheet
+        SELECT *
+        FROM scm_vehicle_patrolinspectionsheet
         <where>
             ${ew.sqlSegment}
         </where>
@@ -13,7 +14,8 @@
 
     <select id="selectListAllVo"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetVo">
-        SELECT * FROM scm_vehicle_patrolinspectionsheet
+        SELECT *
+        FROM scm_vehicle_patrolinspectionsheet
         <where>
             ${ew.sqlSegment}
         </where>
@@ -33,7 +35,8 @@
                svps.dutySid          as liableSid,
                svps.location,
                svps.address,
-               svps.createBySid      as userSid
+               svps.createBySid      as userSid,
+               svps.useOrgSid           orgPath
         FROM scm_vehicle_patrolinspectionsheet svps
         WHERE svps.mainSid = #{recordSid}
     </select>

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

@@ -27,29 +27,20 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*;
-import com.yxt.anrui.scm.api.scmvehinventoryreport.AppReportDto;
-import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonth;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthFeign;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
 import com.yxt.anrui.scm.biz.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionService;
@@ -57,7 +48,12 @@ import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
 import com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthService;
 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.MessageFeign;
 import com.yxt.messagecenter.api.message.MsgTargetUriEnum;
@@ -66,13 +62,6 @@ 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 com.yxt.common.base.service.MybatisBaseService;
-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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -82,7 +71,6 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -257,9 +245,15 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String oneValue = "问题未解决";
         String newDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
         ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        String orgPath = dto.getOrgPath();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
-        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).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) {
             return rb.setMsg("请勿重复点击");
@@ -274,11 +268,11 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             if (monthVoList.size() > 0) {
                 scmVehPatrolinspectionmonthVo = monthVoList.get(0);
             } else {
-                scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid());
+                scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid(),orgPath);
                 monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
                 scmVehPatrolinspectionmonthVo = monthVoList.get(0);
             }
-            List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid);
+            List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), orgPath);
             if (list.size() > 0) {
                 String id = list.get(0).getId();
                 String mainSid = list.get(0).getSid();
@@ -298,18 +292,18 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
             scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
             scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
-            scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+            scmVehiclePatrolinspection.setCreateOrgSid(orgPath);
             scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
             scmVehiclePatrolinspection.setState(0);
-            scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+            scmVehiclePatrolinspection.setUseOrgSid(orgPath);
             scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
 
             BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
             scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
             scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
-            scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+            scmVehiclePatrolinspectionsheet.setCreateOrgSid(orgPath);
             scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
-            scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
+            scmVehiclePatrolinspectionsheet.setUseOrgSid(orgPath);
             scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
             scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
             scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
@@ -346,7 +340,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             return rb.success().setMsg("添加成功");
         }
         BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
-        scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+        scmVehiclePatrolinspectionsheet.setCreateOrgSid(orgPath);
         scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
         scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
         scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
@@ -397,9 +391,15 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String type1 = "06"; //巡检相关照片
         String oneKey = "001";
         String oneValue = "问题未解决";
-
+        String orgPath = dto.getOrgPath();
+        String useOrgSid = "";
+        if(StringUtils.isBlank(orgPath)){
+            useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        }else{
+            useOrgSid = orgPath;
+        }
         ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+//        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         //查询是否有月度巡检记录
         List<ScmVehPatrolinspectionmonthVo> monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
@@ -414,14 +414,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
 
             } else if (scmVehPatrolinspectionmonthVo.getState() == 1) {
                 // 是 先生成月度巡检 和 巡检记录
-                scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid());
+                scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid(),orgPath);
                 monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
                 scmVehPatrolinspectionmonthVo = monthVoList.get(0);
 
             }
         } else { // 否 先生成月度巡检 和 巡检记录
 
-            scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid());
+            scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid(),orgPath);
             monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
             scmVehPatrolinspectionmonthVo = monthVoList.get(0);
 
@@ -585,7 +585,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String twoValue = "问题已解决";
         String threeKey = "003";
         String threeValue = "正常";
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        String orgPath = dto.getOrgPath();
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        }
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         String mainSid = dto.getMainSid();
         String newDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -593,8 +596,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         if (vo == null) {
             ScmVehiclePatrolinspectionsheet patrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
             BeanUtil.copyProperties(dto, patrolinspectionsheet, "sid");
-            patrolinspectionsheet.setUseOrgSid(useOrgSid);
-            patrolinspectionsheet.setCreateOrgSid(useOrgSid);
+            patrolinspectionsheet.setUseOrgSid(orgPath);
+            patrolinspectionsheet.setCreateOrgSid(orgPath);
             patrolinspectionsheet.setCreateBySid(dto.getUserSid());
             patrolinspectionsheet.setModel(dto.getModel());
             patrolinspectionsheet.setModelSid(dto.getModelSid());
@@ -618,8 +621,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         } else {
             ScmVehiclePatrolinspectionsheet patrolinspectionsheet = fetchBySid(vo.getSid());
             BeanUtil.copyProperties(dto, patrolinspectionsheet, "sid");
-            patrolinspectionsheet.setUseOrgSid(useOrgSid);
-            patrolinspectionsheet.setCreateOrgSid(useOrgSid);
+            patrolinspectionsheet.setUseOrgSid(orgPath);
+            patrolinspectionsheet.setCreateOrgSid(orgPath);
             patrolinspectionsheet.setCreateBySid(dto.getUserSid());
             patrolinspectionsheet.setModel(dto.getModel());
             patrolinspectionsheet.setModelSid(dto.getModelSid());

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

@@ -100,7 +100,12 @@ public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign {
 
     @Override
     public ResultBean getInventoryRecords(String userSid) {
-        return scmVehInventorymonthService.getInventoryRecords(userSid);
+        return scmVehInventorymonthService.getInventoryRecords(userSid, "");
+    }
+
+    @Override
+    public ResultBean getInventoryRecords(String userSid, String orgPath) {
+        return scmVehInventorymonthService.getInventoryRecords(userSid, orgPath);
     }
 
     @Override
@@ -115,7 +120,7 @@ public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign {
     }
 
     @Override
-    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid,String userSid) {
-        return scmVehInventorymonthService.getCarInventoryReport(sid,userSid);
+    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid, String userSid) {
+        return scmVehInventorymonthService.getCarInventoryReport(sid, userSid);
     }
 }

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

@@ -26,43 +26,39 @@
 package com.yxt.anrui.scm.biz.scmvehinventorymonth;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionDto;
-import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageQuery;
 import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo;
 import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory;
-import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
 import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListVo;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppLiableListVo;
 import com.yxt.anrui.scm.biz.scmvehicleinventory.ScmVehicleInventoryService;
 import com.yxt.anrui.scm.biz.scmvehinventoryreport.ScmVehInventoryreportService;
-import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 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 org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Project: aaa(aaa) <br/>
@@ -90,6 +86,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
     ScmVehicleInventoryService scmVehicleInventoryService;
     @Autowired
     ScmVehInventoryreportService scmVehInventoryreportService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
 
     private QueryWrapper<ScmVehInventorymonth> createQueryWrapper(ScmVehInventorymonthQuery query) {
@@ -170,16 +168,28 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean getInventoryRecords(String userSid) {
+    public ResultBean getInventoryRecords(String userSid, String orgPath) {
         ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
-        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
+        String orgName = "";
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+            SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
+            orgName = sysStaffOrg.getOrgName();
+        } else {
+            ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath);
+            if (organizationVoResultBean.getSuccess()) {
+                SysOrganizationVo sysOrganizationVo = organizationVoResultBean.getData();
+                if (sysOrganizationVo != null) {
+                    orgName = sysOrganizationVo.getName();
+                }
+            }
+        }
         boolean inventoryState = scmVehicleInventoryService.getInventoryState(userSid);
         if (inventoryState) {
             return rb.setMsg("记录存在未确认数据，盘库记录生成失败！");
         }
-        List<AppScmVehicleCarInventoryListPageVo> vehicleCarInventoryListPageVos = scmVehicleInventoryService.getInventoryAll(useOrgSid);
+        List<AppScmVehicleCarInventoryListPageVo> vehicleCarInventoryListPageVos = scmVehicleInventoryService.getInventoryAll(orgPath);
         if (vehicleCarInventoryListPageVos != null) {
             if (vehicleCarInventoryListPageVos.size() > 0) {
                 for (AppScmVehicleCarInventoryListPageVo vehicleCarInventoryListPageVo : vehicleCarInventoryListPageVos) {
@@ -210,10 +220,10 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             scmVehInventorymonth.setCreateBySid(userSid);
             scmVehInventorymonth.setCreateByName(sysUserVo.getName());
             scmVehInventorymonth.setState(0);
-            scmVehInventorymonth.setCreateOrgSid(useOrgSid);
-            scmVehInventorymonth.setCreateOrgName(sysStaffOrg.getOrgName());
-            scmVehInventorymonth.setUseOrgSid(useOrgSid);
-            scmVehInventorymonth.setUseOrgName(sysStaffOrg.getOrgName());
+            scmVehInventorymonth.setCreateOrgSid(orgPath);
+            scmVehInventorymonth.setCreateOrgName(orgName);
+            scmVehInventorymonth.setUseOrgSid(orgPath);
+            scmVehInventorymonth.setUseOrgName(orgName);
             save(scmVehInventorymonth);
             for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
                 ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory();
@@ -224,8 +234,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
                 scmVehicleInventory.setInventoryState("无");
                 scmVehicleInventory.setInventoryStateKey("");
                 scmVehicleInventory.setCreateBySid(userSid);
-                scmVehicleInventory.setCreateOrgSid(useOrgSid);
-                scmVehicleInventory.setUseOrgSid(useOrgSid);
+                scmVehicleInventory.setCreateOrgSid(orgPath);
+                scmVehicleInventory.setUseOrgSid(orgPath);
                 scmVehicleInventoryService.save(scmVehicleInventory);
             }
         } else {
@@ -236,9 +246,12 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
 
     public IPage<AppScmVehInventorymonthVo> getCarInventoryReportList(PagerQuery<AppScmVehInventorymonthQuery> pagerQuery) {
         IPage<AppScmVehInventorymonthQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         AppScmVehInventorymonthQuery paramsQuery = pagerQuery.getParams();
-        paramsQuery.setUseOrgSid(useOrgSid);
+        String orgPath = paramsQuery.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }
+        paramsQuery.setUseOrgSid(orgPath);
         String date = paramsQuery.getDate();
         if (StringUtils.isNotBlank(date)) {
             String[] s = date.split("至");
@@ -281,7 +294,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         return iPage;
     }
 
-    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid,String userSid) {
+    public ResultBean<AppScmVehInventorymonthInfoVo> getCarInventoryReport(String sid, String userSid) {
         ResultBean<AppScmVehInventorymonthInfoVo> rb = ResultBean.fireFail();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppScmVehInventorymonthInfoVo vo = new AppScmVehInventorymonthInfoVo();

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

@@ -26,7 +26,6 @@
 package com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -38,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: ScmVehPatrolinspectionmonthFeignFallback.java <br/>
@@ -99,7 +96,12 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo
 
     @Override
     public ResultBean getInspectionRecords(String userSid) {
-        return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid);
+        return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid,"");
+    }
+
+    @Override
+    public ResultBean getInspectionRecords(String userSid, String orgPath) {
+        return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid,orgPath);
     }
 
     @Override
@@ -115,6 +117,11 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo
 
     @Override
     public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid,String userSid) {
-        return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid);
+        return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid,"");
+    }
+
+    @Override
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
+        return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid,orgPath);
     }
 }

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

@@ -31,7 +31,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -41,23 +42,19 @@ import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspecti
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheet;
-import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection;
-import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
 import com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportService;
 import com.yxt.common.base.config.component.FileUploadComponent;
-import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 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 org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -102,6 +99,8 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
     FileUploadComponent fileUploadComponent;
     @Autowired
     ScmFileService scmFileService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     private QueryWrapper<ScmVehPatrolinspectionmonth> createQueryWrapper(ScmVehPatrolinspectionmonthQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -182,15 +181,28 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
      * @param userSid
      */
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean getInspectionRecords(String userSid) {
+    public ResultBean getInspectionRecords(String userSid, String orgPath) {
         ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
-        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
+        String orgName = "";
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+            SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
+            orgName = sysStaffOrg.getOrgName();
+        } else {
+            ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath);
+            if (sysOrganizationVoResultBean.getSuccess()) {
+                SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+                if (sysOrganizationVo != null) {
+                    orgName = sysOrganizationVo.getName();
+                }
+            }
+
+        }
         List<String> vinNoList = new ArrayList<>();
         List<String> mainList = new ArrayList<>();
         //所有巡检记录
-        List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid);
+        List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(orgPath);
         List<AppScmInventoryRecordsVo> list = new ArrayList<>();
         if (patrolinspectionVos.size() > 0) {
             for (ScmVehiclePatrolinspectionVo patrolinspectionVo : patrolinspectionVos) {
@@ -224,10 +236,10 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
             scmVehPatrolinspectionmonth.setCreateBySid(userSid);
             scmVehPatrolinspectionmonth.setCreateByName(sysUserVo.getName());
             scmVehPatrolinspectionmonth.setState(0);
-            scmVehPatrolinspectionmonth.setCreateOrgSid(useOrgSid);
-            scmVehPatrolinspectionmonth.setCreateOrgName(sysStaffOrg.getOrgName());
-            scmVehPatrolinspectionmonth.setUseOrgSid(useOrgSid);
-            scmVehPatrolinspectionmonth.setUseOrgName(sysStaffOrg.getOrgName());
+            scmVehPatrolinspectionmonth.setCreateOrgSid(orgPath);
+            scmVehPatrolinspectionmonth.setCreateOrgName(orgName);
+            scmVehPatrolinspectionmonth.setUseOrgSid(orgPath);
+            scmVehPatrolinspectionmonth.setUseOrgName(orgName);
             save(scmVehPatrolinspectionmonth);
             for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
                 ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
@@ -238,9 +250,9 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 scmVehiclePatrolinspection.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
                 scmVehiclePatrolinspection.setPatrolInspectionState("待巡检");
                 scmVehiclePatrolinspection.setPatrolInspectionStateKey("000");
-                scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+                scmVehiclePatrolinspection.setCreateOrgSid(orgPath);
                 scmVehiclePatrolinspection.setCreateBySid(userSid);
-                scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                scmVehiclePatrolinspection.setUseOrgSid(orgPath);
                 scmVehiclePatrolinspection.setPushState(0);
                 scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
             }
@@ -250,14 +262,14 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
                     scmVehiclePatrolinspection.setVinNo(inspection.getVin());
                     scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonth.getSid());
-                    BaseVehicle vehicle = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), useOrgSid).getData();
+                    BaseVehicle vehicle = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), orgPath).getData();
                     scmVehiclePatrolinspection.setVehicleSid(vehicle.getSid());
                     scmVehiclePatrolinspection.setLocation(vehicle.getLocationName());
                     scmVehiclePatrolinspection.setLocationSid(vehicle.getLocation());
                     scmVehiclePatrolinspection.setPatrolInspectionState("问题未解决");
                     scmVehiclePatrolinspection.setPatrolInspectionStateKey("001");
-                    scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
-                    scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspection.setCreateOrgSid(orgPath);
+                    scmVehiclePatrolinspection.setUseOrgSid(orgPath);
                     scmVehiclePatrolinspection.setCreateBySid(userSid);
                     scmVehiclePatrolinspection.setPushState(0);
                     scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
@@ -265,9 +277,9 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     scmVehiclePatrolinspectionsheet.setDutyName(inspection.getLiableName());
                     scmVehiclePatrolinspectionsheet.setVinNo(inspection.getVin());
                     scmVehiclePatrolinspectionsheet.setDutySid(inspection.getLiableSid());
-                    scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setCreateOrgSid(orgPath);
                     scmVehiclePatrolinspectionsheet.setCreateBySid(inspection.getUserSid());
-                    scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setUseOrgSid(orgPath);
                     scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
                     scmVehiclePatrolinspectionsheet.setModel(inspection.getModel());
                     scmVehiclePatrolinspectionsheet.setModelSid(inspection.getModelSid());
@@ -326,9 +338,12 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
 
     public IPage<AppScmVehPatrolinspectionmonthVo> getCarInspectionReportList(PagerQuery<AppScmVehPatrolinspectionmonthQuery> pagerQuery) {
         IPage<AppScmVehPatrolinspectionmonthQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         AppScmVehPatrolinspectionmonthQuery paramsQuery = pagerQuery.getParams();
-        paramsQuery.setUseOrgSid(useOrgSid);
+        String orgPath = paramsQuery.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }
+        paramsQuery.setUseOrgSid(orgPath);
         String date = paramsQuery.getDate();
         if (StringUtils.isNotBlank(date)) {
             String[] s = date.split("至");
@@ -366,9 +381,8 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         return iPage;
     }
 
-    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid) {
+    public ResultBean<AppScmVehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
         ResultBean<AppScmVehPatrolinspectionmonthInfoVo> rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppScmVehPatrolinspectionmonthInfoVo vo = new AppScmVehPatrolinspectionmonthInfoVo();
         AppScmVehPatrolinspectionmonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid);
         if (appScmVehInventorymonthInfoVo != null) {

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

@@ -60,4 +60,9 @@ public interface AppScmBaseInfoFeign {
     @ResponseBody
     public ResultBean<AppScmBaseInfoVo> getToDoNum(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("获取供应链各业务模块待办数量")
+    @GetMapping("/getToDoNum/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath);
+
 }

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

@@ -52,4 +52,9 @@ public class AppScmBaseInfoFeignFallback implements AppScmBaseInfoFeign {
     public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid, String orgPath) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinQuery.java

@@ -12,6 +12,8 @@ public class AppInspectionVinQuery implements Query {
     private String name;
     @ApiModelProperty("用户sid")
     private String userSid;
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid;
+    /*@ApiModelProperty("分公司sid")
+    private String useOrgSid;*/
+
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.supplychain.inspection;
 
-import com.yxt.anrui.base.api.basevehicle.InspectionVinQuery;
-import com.yxt.anrui.base.api.basevehicle.InspectionVinVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -61,6 +59,11 @@ public interface AppScmVehiclePatrolinspectionFeign {
     @ResponseBody
     public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-判断是否生成巡检记录")
+    @GetMapping("/getInspectionRecords/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid, @PathVariable("orgPath") String orgPath);
+
     @ApiOperation("手机端-获取巡检报告列表")
     @PostMapping("/getCarInspectionReportList")
     @ResponseBody
@@ -69,7 +72,12 @@ public interface AppScmVehiclePatrolinspectionFeign {
     @ApiOperation("手机端-获取巡检报告")
     @GetMapping("/getCarInspectionReport/{sid}/{userSid}")
     @ResponseBody
-    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid);
+    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
+
+    @ApiOperation("手机端-获取巡检报告:切换组织机构")
+    @GetMapping("/getCarInspectionReport/{sid}/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid, @PathVariable("orgPath") String orgPath);
 
     @ApiOperation("发送报告")
     @PostMapping("/sendReport")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java

@@ -52,6 +52,11 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle
 		return null;
 	}
 
+	@Override
+	public ResultBean getInspectionRecords(String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<VehPatrolinspectionmonthVo>> getCarInspectionReportList(PagerQuery<VehPatrolinspectionmonthQuery> pagerQuery) {
 		return null;
@@ -62,6 +67,11 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle
 		return null;
 	}
 
+	@Override
+	public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean sendReport(VehPatrolinspectionreportDto dto) {
 		return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java

@@ -119,4 +119,7 @@ public class PatrolinspectionDto implements Dto {
     @ApiModelProperty("存放地点")
     private String warehouse;
 
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java

@@ -57,4 +57,6 @@ public class PatrolinspectionInfoVo implements Vo {
     @ApiModelProperty("用户sid")
     private String userName;
 
+    private String orgPath;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java

@@ -35,7 +35,9 @@ public class PatrolinspectionPageQuery implements Query {
     @ApiModelProperty("存放地点sid")
     private String warehouseSid;
 
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid;
+  /*  @ApiModelProperty("分公司sid")
+    private String useOrgSid;*/
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageQuery.java

@@ -16,7 +16,9 @@ public class StayPatrolinspectionPageQuery implements Query {
     @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
     private String warehouseSid;
 
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid;
+   /* @ApiModelProperty("分公司sid")
+    private String useOrgSid;*/
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionmonthQuery.java

@@ -24,8 +24,8 @@ public class VehPatrolinspectionmonthQuery implements Query {
     @ApiModelProperty("巡检状态")
     private String state;
 
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid;
+   /* @ApiModelProperty("分公司sid")
+    private String useOrgSid;*/
 
     @ApiModelProperty("盘库开始日期")
     @JsonProperty("InventStartDate")
@@ -35,4 +35,7 @@ public class VehPatrolinspectionmonthQuery implements Query {
     @JsonProperty("InventEndDate")
     private String InventEndDate;
 
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java

@@ -59,6 +59,11 @@ public interface AppScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-判断是否生成盘库记录:切换机构")
+    @GetMapping("/getInventoryRecords/{userSid}/{orgPath}")
+    @ResponseBody
+    public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid, @PathVariable("orgPath") String orgPath);
+
     @ApiOperation("手机端-获取待盘库列表")
     @PostMapping("/getInventoryList")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java

@@ -51,6 +51,11 @@ public class AppScmVehicleInventoryFeignFallback implements AppScmVehicleInvento
         return null;
     }
 
+    @Override
+    public ResultBean getInventoryRecords(String userSid, String orgPath) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<InventoryListPageVo>> getInventoryList(PagerQuery<InventoryListPageQuery> pagerQuery) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class CarInventoryListPageQuery implements Query {
 
+    private static final long serialVersionUID = -8642474315791484452L;
     @ApiModelProperty("用户sid")
     private String userSid;
 
@@ -25,7 +26,9 @@ public class CarInventoryListPageQuery implements Query {
     @ApiModelProperty("月度盘库sid")
     private String reportSid;
 
-    @ApiModelProperty("使用组织分公司sid")
-    private String useOrgSid;
+//    @ApiModelProperty("使用组织分公司sid")
+//    private String useOrgSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java

@@ -83,4 +83,7 @@ public class StayInventoryDto implements Dto {
     @ApiModelProperty("定位经纬度")
     private String addressCode;
 
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.api.supplychain.inventory;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -100,5 +101,7 @@ public class StayInventoryInfoVo implements Vo {
 
     @ApiModelProperty("定位经纬度")
     private String addressCode;
+    @JsonProperty("orgPath")
+    private String createOrgSid;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthQuery.java

@@ -21,8 +21,8 @@ public class VehInventorymonthQuery implements Query {
     private String reportSid;
     @ApiModelProperty("盘库结果")
     private String state;
-    @ApiModelProperty("使用组织名称")
-    private String useOrgSid;
+   /* @ApiModelProperty("使用组织名称")
+    private String useOrgSid;*/
 
     @ApiModelProperty("盘库开始日期")
     @JsonProperty("InventStartDate")
@@ -31,4 +31,6 @@ public class VehInventorymonthQuery implements Query {
     @ApiModelProperty("盘库结束日期")
     @JsonProperty("InventEndDate")
     private String InventEndDate;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoRest.java

@@ -27,12 +27,7 @@ package com.yxt.anrui.terminal.biz.supplychain.baseInfo;
 
 import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoFeign;
 import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo;
-import com.yxt.anrui.terminal.api.supplychain.carInspected.AppScmVehinspectItemFeign;
-import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemDto;
-import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemInfoVo;
-import com.yxt.anrui.terminal.biz.supplychain.carInspected.AppScmVehinspectItemService;
 import com.yxt.common.core.result.ResultBean;
-import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -59,6 +54,11 @@ public class AppScmBaseInfoRest implements AppScmBaseInfoFeign {
 
     @Override
     public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid) {
-        return appScmBaseInfoService.getToDoNum(userSid);
+        return appScmBaseInfoService.getToDoNum(userSid,"");
+    }
+
+    @Override
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid, String orgPath) {
+        return appScmBaseInfoService.getToDoNum(userSid,orgPath);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoService.java

@@ -3,12 +3,10 @@ package com.yxt.anrui.terminal.biz.supplychain.baseInfo;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign;
 import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
 import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign;
-import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory;
 import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign;
-import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryFeign;
-import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionFeign;
 import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,14 +26,27 @@ public class AppScmBaseInfoService {
     ScmVehiclePatrolinspectionFeign scmVehiclePatrolinspectionFeign;
 
 
-    public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid) {
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid, String orgPath) {
         ResultBean<AppScmBaseInfoVo> rb = ResultBean.fireFail();
         AppScmBaseInfoVo appScmBaseInfoVo = new AppScmBaseInfoVo();
-        String inspectedCarNum = scmVehicleExamineFeign.getToDoNum(userSid).getData();
-        String storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(userSid).getData();
-        String moveCarNum = scmVehicleGressionFeign.getToDoNum(userSid).getData();
-        String inventoryCarNum = scmVehicleInventoryFeign.getToDoNum(userSid).getData();
-        String inspectinoCarNum = scmVehiclePatrolinspectionFeign.getToDoNum(userSid).getData();
+        String inspectedCarNum = "";
+        String storageCarNum = "";
+        String moveCarNum = "";
+        String inventoryCarNum = "";
+        String inspectinoCarNum = "";
+        if(StringUtils.isBlank(orgPath)){
+             inspectedCarNum = scmVehicleExamineFeign.getToDoNum(userSid).getData();
+             storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(userSid).getData();
+             moveCarNum = scmVehicleGressionFeign.getToDoNum(userSid).getData();
+             inventoryCarNum = scmVehicleInventoryFeign.getToDoNum(userSid).getData();
+             inspectinoCarNum = scmVehiclePatrolinspectionFeign.getToDoNum(userSid).getData();
+        }else{
+            inspectedCarNum = scmVehicleExamineFeign.getToDoNum(userSid,orgPath).getData();
+            storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(userSid,orgPath).getData();
+            moveCarNum = scmVehicleGressionFeign.getToDoNum(userSid,orgPath).getData();
+            inventoryCarNum = scmVehicleInventoryFeign.getToDoNum(userSid,orgPath).getData();
+            inspectinoCarNum = scmVehiclePatrolinspectionFeign.getToDoNum(userSid,orgPath).getData();
+        }
         appScmBaseInfoVo.setInspectedCarNum(inspectedCarNum);
         appScmBaseInfoVo.setStorageCarNum(storageCarNum);
         appScmBaseInfoVo.setMoveCarNum(moveCarNum);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java

@@ -61,6 +61,11 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins
         return appScmVehiclePatrolinspectionService.getInspectionRecords(userSid);
     }
 
+    @Override
+    public ResultBean getInspectionRecords(String userSid, String orgPath) {
+        return appScmVehiclePatrolinspectionService.getInspectionRecords(userSid,orgPath);
+    }
+
     @Override
     public ResultBean<PagerVo<VehPatrolinspectionmonthVo>> getCarInspectionReportList(PagerQuery<VehPatrolinspectionmonthQuery> pagerQuery) {
         return appScmVehiclePatrolinspectionService.getCarInspectionReportList(pagerQuery);
@@ -71,6 +76,11 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins
         return appScmVehiclePatrolinspectionService.getCarInspectionReport(sid,userSid);
     }
 
+    @Override
+    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
+        return appScmVehiclePatrolinspectionService.getCarInspectionReport(sid,userSid,orgPath);
+    }
+
     @Override
     public ResultBean sendReport(VehPatrolinspectionreportDto dto) {
         return appScmVehiclePatrolinspectionService.sendReport(dto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java

@@ -88,6 +88,11 @@ public class AppScmVehiclePatrolinspectionService {
         return resultBean;
     }
 
+    public ResultBean getInspectionRecords(String userSid, String orgPath) {
+        ResultBean resultBean = scmVehPatrolinspectionmonthFeign.getInspectionRecords(userSid, orgPath);
+        return resultBean;
+    }
+
     /**
      * 手机端-获取巡检列表
      *
@@ -166,6 +171,17 @@ public class AppScmVehiclePatrolinspectionService {
         return rb.success().setData(vo);
     }
 
+    public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(String sid, String userSid, String orgPath) {
+        ResultBean<VehPatrolinspectionmonthInfoVo> rb = ResultBean.fireFail();
+        VehPatrolinspectionmonthInfoVo vo = new VehPatrolinspectionmonthInfoVo();
+        ResultBean<AppScmVehPatrolinspectionmonthInfoVo> resultBean = scmVehPatrolinspectionmonthFeign.getCarInspectionReport(sid, userSid, orgPath);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        BeanUtil.copyProperties(resultBean.getData(), vo);
+        return rb.success().setData(vo);
+    }
+
 
     public ResultBean<PagerVo<AppInspectionVinVo>> getInspectionVinList(PagerQuery<AppInspectionVinQuery> pagerQuery) {
         ResultBean<PagerVo<AppInspectionVinVo>> rb = ResultBean.fireFail();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java

@@ -25,19 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.supplychain.inventory;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.scm.api.scmvehicleinventory.*;
 import com.yxt.anrui.terminal.api.supplychain.inventory.*;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.base.utils.StringUtils;
 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 
 /**
@@ -67,6 +62,11 @@ public class AppScmVehicleInventoryRest implements AppScmVehicleInventoryFeign {
         return appScmVehicleInventoryService.getInventoryRecords(userSid);
     }
 
+    @Override
+    public ResultBean getInventoryRecords(String userSid, String orgPath) {
+        return appScmVehicleInventoryService.getInventoryRecords(userSid, orgPath);
+    }
+
     @Override
     public ResultBean<PagerVo<InventoryListPageVo>> getInventoryList(PagerQuery<InventoryListPageQuery> pagerQuery) {
         return appScmVehicleInventoryService.getInventoryList(pagerQuery);
@@ -108,8 +108,8 @@ public class AppScmVehicleInventoryRest implements AppScmVehicleInventoryFeign {
     }
 
     @Override
-    public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(String sid,String userSid) {
-        return appScmVehicleInventoryService.getCarInventoryReport(sid,userSid);
+    public ResultBean<VehInventorymonthInfoVo> getCarInventoryReport(String sid, String userSid) {
+        return appScmVehicleInventoryService.getCarInventoryReport(sid, userSid);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java

@@ -27,14 +27,11 @@ package com.yxt.anrui.terminal.biz.supplychain.inventory;
 
 import cn.hutool.core.bean.BeanUtil;
 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.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryFeign;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthQuery;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthFeign;
-import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto;
 import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDto;
 import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportFeign;
 import com.yxt.anrui.terminal.api.supplychain.inventory.*;
@@ -45,8 +42,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleInventoryService.java <br/>
@@ -86,6 +81,11 @@ public class AppScmVehicleInventoryService {
         return resultBean;
     }
 
+    public ResultBean getInventoryRecords(String userSid,String orgPath) {
+        ResultBean resultBean = scmVehInventorymonthFeign.getInventoryRecords(userSid,orgPath);
+        return resultBean;
+    }
+
     /**
      * 手机端-获取待盘库列表
      *