diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java index 6852a1556e..5036f8fc7f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java @@ -1,5 +1,6 @@ package com.yxt.anrui.base.api.basediscountpackage; +import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -7,6 +8,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -69,6 +71,6 @@ public interface BaseDiscountpackageFeign { ResultBean> getAppPackage(@PathVariable(value = "userSid") String userSid); @ApiOperation("移动端-销售订单获取销售政策优惠包:切换机构") - @GetMapping("/getAppPackage/{userSid}/{orgPath}") - ResultBean> getAppPackage(@PathVariable(value = "userSid") String userSid,@PathVariable(value = "orgPath") String orgPath); + @GetMapping("/getAppPackage") + ResultBean> getAppPackage(@SpringQueryMap AppBaseDiscountpackageQuery appBaseDiscountpackageQuery); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java index 79e455bd74..bfead9ee79 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java @@ -67,7 +67,7 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig } @Override - public ResultBean> getAppPackage(String userSid, String orgPath) { + public ResultBean> getAppPackage(AppBaseDiscountpackageQuery appBaseDiscountpackageQuery) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/app/AppBaseDiscountpackageQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/app/AppBaseDiscountpackageQuery.java index 0f3d3e7ab3..709c71a9ce 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/app/AppBaseDiscountpackageQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/app/AppBaseDiscountpackageQuery.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basediscountpackage.app; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,8 +10,9 @@ import lombok.Data; * @Description */ @Data -public class AppBaseDiscountpackageQuery implements Query { - private static final long serialVersionUID = 4058239365095597367L; +public class AppBaseDiscountpackageQuery { private String userSid; + @ApiModelProperty("组织机构") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java index f3fde3dc4a..e0f30bf8f7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java @@ -19,6 +19,7 @@ public class BaseInterNalPurchaseCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") + @NotBlank(message = "用户全路径不能为空") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java index c440876385..1d7605ca23 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java @@ -19,6 +19,7 @@ public class BaseModelModPriceCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") + @NotBlank(message = "用户全路径不能为空") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java index 01209a703d..f8e4716b18 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java @@ -55,6 +55,4 @@ public class BusinessVariablesDto { * 业务参数，按需传递 */ private Map formVariables; - - private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 6a6ba7473d..efe258ccb9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -1,10 +1,7 @@ package com.yxt.anrui.base.api.basevehicle; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; -import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; -import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; -import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; -import com.yxt.anrui.base.api.basevehicle.app.VinQuery; +import com.yxt.anrui.base.api.basevehicle.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -405,8 +402,8 @@ public interface BaseVehicleFeign { public ResultBean> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid); @ApiOperation("根据仓库sid 获取车架号") - @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}/{orgPath}") - public ResultBean> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid, @PathVariable(value = "orgPath", required = false) String orgPath); + @GetMapping("/getVinByWarehouseSid") + public ResultBean> getVinByWarehouseSid(@SpringQueryMap GetVinQuery getVinQuery); /** * 存放地点变更选择车辆 @@ -430,7 +427,7 @@ public interface BaseVehicleFeign { @PostMapping("/selectByVinNoAndOrgSid") ResultBean selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo, @RequestParam("createOrgSid") String createOrgSid); - @ApiOperation("巡检获取车价号") + @ApiOperation("巡检获取车价号：已添加切换机构") @PostMapping("/getInspectionVinList") @ResponseBody public ResultBean> getInspectionVinList(@RequestBody PagerQuery pagerQuery); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 7a34c21d8e..40c4e291c9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -1,10 +1,7 @@ package com.yxt.anrui.base.api.basevehicle; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; -import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; -import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; -import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; -import com.yxt.anrui.base.api.basevehicle.app.VinQuery; +import com.yxt.anrui.base.api.basevehicle.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -310,7 +307,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) { + public ResultBean> getVinByWarehouseSid(GetVinQuery getVinQuery) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/GetVinQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/GetVinQuery.java new file mode 100644 index 0000000000..093c30de3c --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/GetVinQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.base.api.basevehicle.app; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/22 21:10 + * @Description + */ +@Data +public class GetVinQuery { + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构") + private String orgPath; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java index aad3896ad8..c29952fb7b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java @@ -20,6 +20,7 @@ public class BaseActualSalesCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") + @NotBlank(message = "用户全路径不能为空") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java index 22799f6463..2869935ca2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java @@ -115,8 +115,8 @@ public interface BaseVehicleBrandFeign { ResultBean> selectAppListByUserSid(@PathVariable("userSid") String userSid); @ApiOperation("手机端-获取品牌数据字典:切换组织机构") - @GetMapping("/selectAppListByUserSid/{userSid}/{orgPath}") - ResultBean> selectAppListByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + @GetMapping("/selectAppListByUserSid") + ResultBean> selectAppListByUserSid(@SpringQueryMap VehicleBrandQuery vehicleBrandQuery); @ApiOperation("根据品牌sid获取品牌信息") @GetMapping("/fetchBySid/{sid}") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java index d9718ba16d..8b5f6e7e27 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java @@ -82,7 +82,7 @@ public class BaseVehicleBrandFeignFallback implements BaseVehicleBrandFeign { } @Override - public ResultBean> selectAppListByUserSid(String userSid, String orgPath) { + public ResultBean> selectAppListByUserSid(VehicleBrandQuery vehicleBrandQuery) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/VehicleBrandQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/VehicleBrandQuery.java new file mode 100644 index 0000000000..7e6dea0fac --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/VehicleBrandQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.base.api.basevehiclebrand; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/22 21:30 + * @Description + */ +@Data +public class VehicleBrandQuery { + + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java index 801d36904a..17686c51b7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java @@ -19,7 +19,7 @@ public class BusVehicleApplyCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "参数错误：orgSidPath") + @NotBlank(message = "用户全路径不能为空") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java index 5838b49145..22312dfb65 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java @@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basediscountpackage; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basediscountpackage.*; +import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -131,12 +132,14 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign { @Override public ResultBean> getAppPackage(String userSid) { - return baseDiscountpackageService.getAppPackage(userSid,""); + AppBaseDiscountpackageQuery appBaseDiscountpackageQuery = new AppBaseDiscountpackageQuery(); + appBaseDiscountpackageQuery.setUserSid(userSid); + return baseDiscountpackageService.getAppPackage(appBaseDiscountpackageQuery); } @Override - public ResultBean> getAppPackage(String userSid, String orgPath) { - return baseDiscountpackageService.getAppPackage(userSid,orgPath); + public ResultBean> getAppPackage(AppBaseDiscountpackageQuery appBaseDiscountpackageQuery) { + return baseDiscountpackageService.getAppPackage(appBaseDiscountpackageQuery); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index 59edc77ece..14c0e6351b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basediscountpackage.*; +import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; @@ -316,8 +317,10 @@ public class BaseDiscountpackageService extends MybatisBaseService> getAppPackage(String userSid, String orgPath) { + public ResultBean> getAppPackage(AppBaseDiscountpackageQuery appBaseDiscountpackageQuery) { ResultBean> rb = ResultBean.fireFail(); + String orgPath = appBaseDiscountpackageQuery.getOrgPath(); + String userSid = appBaseDiscountpackageQuery.getUserSid(); QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isBlank(orgPath)) { if (StringUtils.isNotBlank(userSid)) { @@ -329,6 +332,7 @@ public class BaseDiscountpackageService extends MybatisBaseService formVariables = bv.getFormVariables(); if (formVariables != null) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 3ffda0c42b..17fad9503a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -299,7 +299,7 @@ public class BaseManufacturerService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); String finalSid = sid; - Future future1 = pool.submit(() -> { + /* Future future1 = pool.submit(() -> { //查询所有分公司，并向所有分公司中插入供应商信息 ResultBean> orgList = sysOrganizationFeign.selectOrgSidList(); List list = orgList.getData(); @@ -315,7 +315,7 @@ public class BaseManufacturerService extends MybatisBaseService { //金蝶推送 BdSupplier bdSupplier = new BdSupplier(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java index f120609fe1..eeefa0f38f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java @@ -122,7 +122,8 @@ public class BaseMiddlemanService extends MybatisBaseService baseModelModpriceModelVos = baseModelModpriceModelService.fetchByMainSid(bv.getBusinessSid()); if (bv.getTaskId().equals(baseModelModprice.getTaskId())) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index c33c609bd1..8d33e5a0f6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -524,11 +524,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService> getVinByWarehouseSid(String warehouseSid, String userSid) { - return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid, ""); + GetVinQuery getVinQuery = new GetVinQuery(); + getVinQuery.setWarehouseSid(warehouseSid); + getVinQuery.setUserSid(userSid); + return baseVehicleService.getVinByWarehouseSid(getVinQuery); } @Override - public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) { - return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid, orgPath); + public ResultBean> getVinByWarehouseSid(GetVinQuery getVinQuery) { + return baseVehicleService.getVinByWarehouseSid(getVinQuery); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index c411ecb9f2..f229cf76fd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -8,6 +8,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; +import com.yxt.anrui.base.api.basevehicle.app.GetVinQuery; import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; @@ -1063,6 +1064,8 @@ public class BaseVehicleService extends MybatisBaseService getVins(String modelSid, String configSid, String userSid, String orgPath) { if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + }else{ + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } List vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath); if (vins.size() <= 0) { @@ -2006,12 +2009,17 @@ public class BaseVehicleService extends MybatisBaseService> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) { + public ResultBean> getVinByWarehouseSid(GetVinQuery getVinQuery) { ResultBean rb = ResultBean.fireFail(); + String warehouseSid = getVinQuery.getWarehouseSid(); + String userSid = getVinQuery.getUserSid(); + String orgPath = getVinQuery.getOrgPath(); QueryWrapper qw = new QueryWrapper<>(); List carSidList = baseVehicleTempstateService.selectAll("001"); if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + }else{ + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } if (StringUtils.isNotBlank(orgPath)) { qw.eq("bv.createOrgSid", orgPath); @@ -2966,6 +2974,8 @@ public class BaseVehicleService extends MybatisBaseService> selectAppListByUserSid(String userSid) { - List list = baseVehicleBrandService.selectAppListByUserSid(userSid,""); + VehicleBrandQuery vehicleBrandQuery = new VehicleBrandQuery(); + vehicleBrandQuery.setUserSid(userSid); + List list = baseVehicleBrandService.selectAppListByUserSid(vehicleBrandQuery); return new ResultBean>().success().setData(list); } @Override - public ResultBean> selectAppListByUserSid(String userSid, String orgPath) { - List list = baseVehicleBrandService.selectAppListByUserSid(userSid,orgPath); + public ResultBean> selectAppListByUserSid(VehicleBrandQuery vehicleBrandQuery) { + List list = baseVehicleBrandService.selectAppListByUserSid(vehicleBrandQuery); return new ResultBean>().success().setData(list); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index 50ebf9da13..4db9cb9010 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -219,12 +219,15 @@ public class BaseVehicleBrandService extends MybatisBaseService selectAppListByUserSid(String userSid,String orgPath) { + public List selectAppListByUserSid(VehicleBrandQuery vehicleBrandQuery) { + String userSid = vehicleBrandQuery.getUserSid(); + String orgPath = vehicleBrandQuery.getOrgPath(); if(StringUtils.isBlank(orgPath)){ orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + }else{ + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } List list = baseMapper.selectAppListByUserSid(orgPath); return list; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 0f0b99203f..2b2a501adb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionDto; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; -import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.busvehicleapply.*; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo; @@ -470,11 +469,6 @@ public class BusVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index c6b077a9a2..e9c6dd11f6 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -384,6 +384,10 @@ public class CrmCustomerTempService extends MybatisBaseService formVariables =new HashMap<>(); - @ApiModelProperty("机构sid:切换结构使用") - private String orgPath; + /* @ApiModelProperty("机构sid:切换结构使用") + private String orgPath;*/ } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index c9a3ebca13..a0e7de6e46 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -116,7 +116,6 @@ public class FlowableRest implements FlowableFeign { public ResultBean getNextNodeUserSidsOfCreate(BusinessVariables bv) { ResultBean rb = ResultBean.fireFail(); String orgSidPath=bv.getOrgSidPath(); - String orgPath = bv.getOrgPath(); //根据业务参数取流程流转的环节 信息 List> list = (List>) flowtaskService.getProcessCirculationNodesByMap(bv).getData(); if(list==null||list.size()<2){ @@ -127,10 +126,10 @@ public class FlowableRest implements FlowableFeign { if(o==null){ return rb.setMsg("流程设计问题"); } - return getNextUserSids(rb, orgSidPath, o,orgPath); + return getNextUserSids(rb, orgSidPath, o); } - private ResultBean< UserAndOrgPath> getNextUserSids(ResultBean rb, String orgSidPath, Object o,String orgPath) { + private ResultBean< UserAndOrgPath> getNextUserSids(ResultBean rb, String orgSidPath, Object o) { UserAndOrgPath mapParam=new UserAndOrgPath(); JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(o)); String roleSid = jsonArray.get(0).toString(); @@ -138,7 +137,6 @@ public class FlowableRest implements FlowableFeign { UserQuery userQuery = new UserQuery(); userQuery.setRoleSid(roleSid); userQuery.setOrgSidPath(orgSidPath); - userQuery.setOrgPath(orgPath); List sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); if(sysUserVos==null||sysUserVos.size()<1){ return rb.fail().setMsg("环节没有用户"); @@ -166,7 +164,6 @@ public class FlowableRest implements FlowableFeign { ResultBean rb = ResultBean.fireSuccess(); String orgSidPath=bv.getOrgSidPath(); String taskDefKey=bv.getTaskDefKey(); - String orgPath = bv.getOrgPath(); //根据业务参数取流程流转的环节 信息 List> list = (List>) flowtaskService.getProcessCirculationNodesByMap(bv).getData(); @@ -185,7 +182,7 @@ public class FlowableRest implements FlowableFeign { return rb.setData(new UserAndOrgPath()); }else{ Object o = task_map.get("candidateGroups"); - return getNextUserSids(rb, orgSidPath, o,orgPath); + return getNextUserSids(rb, orgSidPath, o); } } @@ -353,7 +350,6 @@ public class FlowableRest implements FlowableFeign { UserQuery userQuery = new UserQuery(); userQuery.setRoleSid(roleSid); userQuery.setOrgSidPath(dto.getOrgSidPath()); - userQuery.setOrgPath(dto.getOrgPath()); List sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); sysUserVoLists.addAll(sysUserVos); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoQuery.java index f52e77d308..360da3ca77 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoQuery.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoQuery.java @@ -19,4 +19,7 @@ public class FlowTaskDoQuery implements Query { private String userSid; @ApiModelProperty("工作名称") private String names; + + @ApiModelProperty("组织机构sid") + private String orgPath; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java index d95ebc505f..119f47f917 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -104,4 +104,9 @@ public interface SysStaffOrgFeign { @ResponseBody @ApiOperation("根据组织staffSid获取分公司SysStaffOrg") ResultBean getOrgByStaffSid(@RequestParam(value = "staffSid") String staffSid); + + @GetMapping("/getOrgSidByPath") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的分公司sid") + ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java index fede0264a8..3cecb5db71 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java @@ -95,6 +95,11 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { return null; } + @Override + public ResultBean getOrgSidByPath(String orgPath) { + return null; + } + @Override public ResultBean selectAllByStaffSid(String staffSid) { return null; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java index 2c1a05555b..17388674b0 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java @@ -6,6 +6,7 @@ import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -43,8 +44,8 @@ public interface AppSysUserFeign { @ApiOperation(value = "我的信息:切换机构") @ResponseBody - @GetMapping("/getMyInfo/{userSid}/{orgPath}") - public ResultBean getMyInfo(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + @GetMapping("/getMyInfo") + public ResultBean getMyInfo(@SpringQueryMap MyInfoQuery myInfoQuery); @ApiOperation(value = "手机更改密码") @ResponseBody diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java index 8f4e3d46fd..d42c22448c 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java @@ -32,7 +32,7 @@ public class AppSysUserFeignFallback implements AppSysUserFeign { } @Override - public ResultBean getMyInfo(String userSid, String orgPath) { + public ResultBean getMyInfo(MyInfoQuery myInfoQuery) { return null; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java new file mode 100644 index 0000000000..d2c0726031 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.portal.api.sysuser.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/22 15:24 + * @Description + */ +@Data +public class MyInfoQuery implements Query { + private static final long serialVersionUID = -4771501933318214145L; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java index 6647cb7690..c833cd780d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java @@ -373,13 +373,13 @@ public class FlowableService extends MybatisBaseService getTodoNum(String userSid) { return flowTaskFeign.getTodoNum(userSid); } - public ResultBean getTodoNum(String userSid,String orgPath) { - return flowTaskFeign.getTodoNum(userSid,orgPath); + + public ResultBean getTodoNum(String userSid, String orgPath) { + return flowTaskFeign.getTodoNum(userSid, orgPath); } public ResultBean getNextTasks(String taskId) { @@ -460,6 +461,7 @@ public class FlowableService extends MybatisBaseService taskParamList = new ArrayList<>(); if (StringUtils.isNotBlank(names)) { @@ -469,6 +471,13 @@ public class FlowableService extends MybatisBaseService> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery); @@ -507,7 +516,7 @@ public class FlowableService extends MybatisBaseService integers = appVer.get(appSid2); if (integers == null) { @@ -530,7 +539,7 @@ public class FlowableService extends MybatisBaseService> selectAppNum(String userSid,String orgPath) { + public ResultBean> selectAppNum(String userSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); String linkSid = LINKSID; List appIndexAppNumVos = appSubsetVersionService.selectAppNum(linkSid); @@ -155,12 +156,15 @@ public class AppIndexRest implements AppIndexFeign { if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) { //供应链 ResultBean indexCountVo = ResultBean.fireFail(); - if(StringUtils.isBlank(orgPath)){ + if (StringUtils.isBlank(orgPath)) { indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid); - }else{ - indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid,orgPath); + } else { + //切换机构 + AppScmBaseInfoQuery appScmBaseInfoQuery = new AppScmBaseInfoQuery(); + appScmBaseInfoQuery.setOrgPath(orgPath); + appScmBaseInfoQuery.setUserSid(userSid); + indexCountVo = appScmBaseInfoFeign.getToDoNum(appScmBaseInfoQuery); } -// ResultBean indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid); int count = 0; if (indexCountVo.getSuccess()) { AppScmBaseInfoVo appScmBaseInfoVo = indexCountVo.getData(); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index aab003bf45..d57489127b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -706,7 +706,8 @@ public class SysStaffinfoService extends MybatisBaseService { @Select("select * from sys_staff_org where staffSid=#{staffSid} AND manageType != 2") SysStaffOrg selectAllByStaffSid(String staffSid); - @Select("select * from sys_staff_org where staffSid=#{sid} order by id limit 1") + @Select("select * from sys_staff_org where staffSid=#{sid} and manageType = '3' order by id limit 1") SysStaffOrg getOrgByStaffSid(String sid); @Select("select * from sys_staff_org where staffSid=#{sid} and orgSidPath = #{path} ") diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml index c7986a6274..151ad28ede 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml @@ -62,7 +62,7 @@ @@ -106,6 +106,6 @@ \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java index ea2c7a171f..75b47cee5b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java @@ -130,6 +130,11 @@ public class SysStaffOrgRest implements SysStaffOrgFeign { return rb.success().setData(sysStaffOrg); } + @Override + public ResultBean getOrgSidByPath(String orgPath) { + return sysStaffOrgService.getOrgSidByPath(orgPath); + } + @Override public ResultBean selectAllByStaffSid(String staffSid) { return sysStaffOrgService.selectAllByStaffSid(staffSid); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index 973575d046..90595a01b7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; /** @@ -156,8 +157,8 @@ public class SysStaffOrgService extends MybatisBaseService getSysStaffOrgListByStaffSid(String staffSid) { @@ -203,7 +204,7 @@ public class SysStaffOrgService extends MybatisBaseService rb = ResultBean.fireFail(); String orgSid = baseMapper.selectBySidPathByStaffSid(applySid); String orgPathSid = ""; - if (StringUtils.isNotBlank(orgSid)){ + if (StringUtils.isNotBlank(orgSid)) { orgPathSid = getOrgByOrgSid(orgSid); } return rb.success().setData(orgPathSid); @@ -219,8 +220,8 @@ public class SysStaffOrgService extends MybatisBaseService getOrgByStaffSidList(String sid) { @@ -261,17 +262,18 @@ public class SysStaffOrgService extends MybatisBaseService selectByStaffS(String staffSid) { @@ -287,6 +289,15 @@ public class SysStaffOrgService extends MybatisBaseService selectOrgBySid(String orgPath, String staffSid) { - return baseMapper.selectOrgBySid(orgPath,staffSid); + return baseMapper.selectOrgBySid(orgPath, staffSid); + } + + public ResultBean getOrgSidByPath(String orgPath) { + ResultBean rb = ResultBean.fireFail(); + //根据用户全路径获取分公司sid + List stringList = Arrays.asList(orgPath.split("/")); + String orgSid = stringList.get(stringList.size() - 1); + orgPath = sysOrganizationService.getOrgSid(orgSid); + return rb.success().setData(orgPath); } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java index 0576a86d59..2c3c7935ea 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java @@ -60,5 +60,5 @@ public interface SysStaffPostMapper extends BaseMapper { String selectPost(String sid); - List getPost(String userSid); + List getPost(String staffSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml index 2d590904dd..f1902a8fae 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml @@ -53,9 +53,8 @@ \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostService.java index 955e8e7ede..9a5fbc9c70 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostService.java @@ -136,7 +136,7 @@ public class SysStaffPostService extends MybatisBaseService getPost(String userSid) { - return baseMapper.getPost(userSid); + public List getPost(String staffSid) { + return baseMapper.getPost(staffSid); } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index 57d9a8a754..41cbffd46a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -232,7 +232,7 @@ * File: ScmVehicleEnterlibraryFeignFallback.java
@@ -152,11 +148,13 @@ public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign { @Override public ResultBean getToDoNum(String userSid) { - return scmVehicleEnterlibraryService.getToDoNum(userSid,""); + AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery(); + appToDoNumQuery.setUserSid(userSid); + return scmVehicleEnterlibraryService.getToDoNum(appToDoNumQuery); } @Override - public ResultBean getToDoNum(String userSid, String orgPath) { - return scmVehicleEnterlibraryService.getToDoNum(userSid,orgPath); + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { + return scmVehicleEnterlibraryService.getToDoNum(appToDoNumQuery); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index d28dc5a4c7..005f9120e9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -58,6 +58,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; @@ -243,6 +244,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService warehouseImage = new ArrayList<>(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData(); - SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(data.getStaffSid()).getData(); - AppScmVehicleEnterlibraryInfoVo vo = baseMapper.getCarWarehousingInfo(warehousingSid, useOrgSid); + String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid(); + SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(staffSid).getData(); + AppScmVehicleEnterlibraryInfoVo vo = baseMapper.getCarWarehousingInfo(warehousingSid); vo.setName(data1.getName()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); String date = simpleDateFormat.format(new Date()); @@ -585,10 +587,15 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService getToDoNum(String userSid, String orgPath) { + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isBlank(orgPath)) { + String userSid = appToDoNumQuery.getUserSid(); + String orgPath = appToDoNumQuery.getOrgPath(); + if(StringUtils.isBlank(orgPath)){ orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + }else{ + //切换机构 + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } int count = baseMapper.getToDoNum(orgPath); return rb.success().setData(String.valueOf(count)); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java index ad16416ec6..cafcf79a72 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java @@ -25,10 +25,8 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmvehicleexamine; -import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.scm.api.scmvehicleexamine.*; -import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -163,11 +161,13 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign { @Override public ResultBean getToDoNum(String userSid) { - return scmVehicleExamineService.getToDoNum(userSid,""); + AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery(); + appToDoNumQuery.setUserSid(userSid); + return scmVehicleExamineService.getToDoNum(appToDoNumQuery); } @Override - public ResultBean getToDoNum(String userSid, String orgPath) { - return scmVehicleExamineService.getToDoNum(userSid,orgPath); + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { + return scmVehicleExamineService.getToDoNum(appToDoNumQuery); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 43b377bac1..470cce613a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -233,6 +233,8 @@ public class ScmVehicleExamineService extends MybatisBaseService factoryImages = new ArrayList<>(); List carInspectedImages = new ArrayList<>(); -// String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid); if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(vo.getPurchaseKey())) { vo.setEditVin(true); @@ -564,6 +565,8 @@ public class ScmVehicleExamineService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath); if(sysOrganizationVoResultBean.getSuccess()){ @@ -572,7 +575,6 @@ public class ScmVehicleExamineService extends MybatisBaseService getToDoNum(String userSid,String orgPath) { + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { ResultBean rb = ResultBean.fireFail(); + String userSid = appToDoNumQuery.getUserSid(); + String orgPath = appToDoNumQuery.getOrgPath(); if(StringUtils.isBlank(orgPath)){ orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + }else{ + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } int count = baseMapper.getToDoNum(orgPath); return rb.success().setData(String.valueOf(count)); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java index 512055ca0d..718021346a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmvehiclegression.*; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.*; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; @@ -45,7 +46,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -218,12 +221,14 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign { @Override public ResultBean getToDoNum(String userSid) { - return scmVehicleGressionService.getToDoNum(userSid,""); + AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery(); + appToDoNumQuery.setUserSid(userSid); + return scmVehicleGressionService.getToDoNum(appToDoNumQuery); } @Override - public ResultBean getToDoNum(String userSid, String orgPath) { - return scmVehicleGressionService.getToDoNum(userSid,orgPath); + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { + return scmVehicleGressionService.getToDoNum(appToDoNumQuery); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 079b1844c4..d7c25b6d37 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -31,7 +31,10 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; +import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo; +import com.yxt.anrui.base.api.basevehicle.VehicleGression; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; @@ -41,7 +44,6 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -60,6 +62,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit; import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmvehiclegression.*; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeQuery; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeVo; @@ -67,7 +70,6 @@ import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferTaskQuery import com.yxt.anrui.scm.api.scmvehiclegression.flowable.SubmitCarTransferDto; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDto; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; -import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; import com.yxt.anrui.scm.biz.scmexitpermit.ScmExitPermitService; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService; @@ -323,8 +325,6 @@ public class ScmVehicleGressionService extends MybatisBaseService getCarTransferList(PagerQuery pagerQuery) { String type = "05"; IPage page = PagerUtil.queryToPage(pagerQuery); - /*String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); - pagerQuery.getParams().setUseOrgSid(useOrgSid);*/ QueryWrapper qw = appQueryWrapper(pagerQuery.getParams()); AppScmVehicleGressionPageQuery params = pagerQuery.getParams(); IPage iPage = baseMapper.getCarTransferList(page, qw, params.getNames()); @@ -366,7 +366,13 @@ public class ScmVehicleGressionService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(userSid); @@ -407,7 +416,7 @@ public class ScmVehicleGressionService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); if (!staffOrgResultBean.getSuccess()) { return rb.setMsg(staffOrgResultBean.getMsg()); @@ -705,7 +714,7 @@ public class ScmVehicleGressionService extends MybatisBaseService variables = new HashMap<>(); @@ -1385,10 +1389,14 @@ public class ScmVehicleGressionService extends MybatisBaseService getToDoNum(String userSid, String orgPath) { + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { ResultBean rb = ResultBean.fireFail(); + String userSid = appToDoNumQuery.getUserSid(); + String orgPath = appToDoNumQuery.getOrgPath(); if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } else { + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } int count = baseMapper.getToDoNum(orgPath, userSid); return rb.success().setData(String.valueOf(count)); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java index 9e5e10f179..d4fa0bc82b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java @@ -26,9 +26,8 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmvehicleinventory.*; -import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageQuery; -import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageVo; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -165,11 +164,13 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign { @Override public ResultBean getToDoNum(String userSid) { - return scmVehicleInventoryService.getToDoNum(userSid,""); + AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery(); + appToDoNumQuery.setUserSid(userSid); + return scmVehicleInventoryService.getToDoNum(appToDoNumQuery); } @Override - public ResultBean getToDoNum(String userSid, String orgPath) { - return scmVehicleInventoryService.getToDoNum(userSid,orgPath); + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { + return scmVehicleInventoryService.getToDoNum(appToDoNumQuery); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index 667d1dfc75..27d327756a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -32,6 +32,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmvehicleinventory.*; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto; import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo; @@ -193,6 +194,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService getToDoNum(String userSid,String orgPath) { + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { ResultBean rb = ResultBean.fireFail(); + String orgPath = appToDoNumQuery.getOrgPath(); + String userSid = appToDoNumQuery.getUserSid(); if(StringUtils.isBlank(orgPath)){ orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + }else{ + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } int count = baseMapper.getInventoryState(orgPath); return rb.success().setData(String.valueOf(count)); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java index 89f73f6633..cc98567a3e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; @@ -128,11 +129,13 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio @Override public ResultBean getToDoNum(String userSid) { - return scmVehiclePatrolinspectionService.getToDoNum(userSid,""); + AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery(); + appToDoNumQuery.setUserSid(userSid); + return scmVehiclePatrolinspectionService.getToDoNum(appToDoNumQuery); } @Override - public ResultBean getToDoNum(String userSid, String orgPath) { - return scmVehiclePatrolinspectionService.getToDoNum(userSid,orgPath); + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { + return scmVehiclePatrolinspectionService.getToDoNum(appToDoNumQuery); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java index 2d387bfc5a..20b5e56c36 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java @@ -32,6 +32,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.scm.api.scmfile.ScmFileVo; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; @@ -211,6 +212,8 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService qw = new QueryWrapper<>(); @@ -260,6 +263,8 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService getToDoNum(String userSid, String orgPath) { + public ResultBean getToDoNum(AppToDoNumQuery appToDoNumQuery) { ResultBean rb = ResultBean.fireFail(); + String orgPath = appToDoNumQuery.getOrgPath(); + String userSid = appToDoNumQuery.getUserSid(); if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + }else{ + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } int count = baseMapper.getToDoNum(orgPath); return rb.success().setData(String.valueOf(count)); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java index 79b97b98d6..869804abf8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java @@ -26,7 +26,6 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; @@ -40,6 +39,7 @@ import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspe import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehRecordsQuery; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService; @@ -49,19 +49,15 @@ import com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionm import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.JPushServer; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.AppMessageDto; import com.yxt.messagecenter.api.message.AppScmMessageFlowableQuery; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MsgTargetUriEnum; -import com.yxt.messagecenter.api.messagelist.MessageListDto; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import com.yxt.messagecenter.api.messagetype.MessageTypeFeign; -import com.yxt.messagecenter.api.messagetype.MessageTypeVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -74,9 +70,6 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; /** * Project: anrui_scm(anrui_scm)
@@ -250,10 +243,9 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService 0) { @@ -269,7 +261,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService 0) { scmVehPatrolinspectionmonthVo = monthVoList.get(0); } else { - scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid(),orgPath); + VehRecordsQuery vehRecordsQuery = new VehRecordsQuery(); + vehRecordsQuery.setUserSid(dto.getUserSid()); + vehRecordsQuery.setOrgPath(orgPath); + scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery); monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); scmVehPatrolinspectionmonthVo = monthVoList.get(0); } @@ -417,8 +412,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); @@ -433,14 +430,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService * File: ScmVehInventorymonthFeignFallback.java
@@ -100,12 +96,14 @@ public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign { @Override public ResultBean getInventoryRecords(String userSid) { - return scmVehInventorymonthService.getInventoryRecords(userSid, ""); + InventoryRecordsQuery inventoryRecordsQuery = new InventoryRecordsQuery(); + inventoryRecordsQuery.setUserSid(userSid); + return scmVehInventorymonthService.getInventoryRecords(inventoryRecordsQuery); } @Override - public ResultBean getInventoryRecords(String userSid, String orgPath) { - return scmVehInventorymonthService.getInventoryRecords(userSid, orgPath); + public ResultBean getInventoryRecords(InventoryRecordsQuery inventoryRecordsQuery) { + return scmVehInventorymonthService.getInventoryRecords(inventoryRecordsQuery); } @Override @@ -121,6 +119,14 @@ public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign { @Override public ResultBean getCarInventoryReport(String sid, String userSid) { - return scmVehInventorymonthService.getCarInventoryReport(sid, userSid); + AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery = new AppScmVehInventorymonthInfoQuery(); + appScmVehInventorymonthInfoQuery.setSid(sid); + appScmVehInventorymonthInfoQuery.setUserSid(userSid); + return scmVehInventorymonthService.getCarInventoryReport(appScmVehInventorymonthInfoQuery); + } + + @Override + public ResultBean getCarInventoryReport(AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery) { + return scmVehInventorymonthService.getCarInventoryReport(appScmVehInventorymonthInfoQuery); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java index 7a713269b5..06f6c37259 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java @@ -168,8 +168,10 @@ public class ScmVehInventorymonthService extends MybatisBaseService organizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath); if (organizationVoResultBean.getSuccess()) { SysOrganizationVo sysOrganizationVo = organizationVoResultBean.getData(); @@ -250,6 +253,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService getCarInventoryReport(String sid, String userSid) { + public ResultBean getCarInventoryReport(AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + String sid = appScmVehInventorymonthInfoQuery.getSid(); + String userSid = appScmVehInventorymonthInfoQuery.getUserSid(); + String orgPath = appScmVehInventorymonthInfoQuery.getOrgPath(); + if(StringUtils.isBlank(orgPath)){ + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + }else{ + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } +// String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); AppScmVehInventorymonthInfoVo vo = new AppScmVehInventorymonthInfoVo(); AppScmVehInventorymonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid); List recipientListVos = scmVehInventoryreportService.selectByMainSid(userSid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java index d6146d358d..69fa29b3ac 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java @@ -26,37 +26,30 @@ package com.yxt.anrui.scm.biz.scmvehinventoryreport; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoQuery; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo; import com.yxt.anrui.scm.api.scmvehinventoryreport.*; import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.JPushServer; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.AppMessageDto; import com.yxt.messagecenter.api.message.AppScmMessageFlowableQuery; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MsgTargetUriEnum; -import com.yxt.messagecenter.api.messagelist.MessageListDto; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import com.yxt.messagecenter.api.messagetype.MessageTypeFeign; -import com.yxt.messagecenter.api.messagetype.MessageTypeVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; /** * Project: aaa(aaa)
@@ -142,7 +135,10 @@ public class ScmVehInventoryreportService extends MybatisBaseService recipientList = dto.getRecipientList(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java index 6552cbae4c..18f83a8fe4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java @@ -96,12 +96,14 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo @Override public ResultBean getInspectionRecords(String userSid) { - return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid,""); + VehRecordsQuery vehRecordsQuery = new VehRecordsQuery(); + vehRecordsQuery.setUserSid(userSid); + return scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery); } @Override - public ResultBean getInspectionRecords(String userSid, String orgPath) { - return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid,orgPath); + public ResultBean getInspectionRecords(VehRecordsQuery vehRecordsQuery) { + return scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery); } @Override @@ -117,11 +119,14 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo @Override public ResultBean getCarInspectionReport(String sid,String userSid) { - return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid,""); + VehPatrolinInfoQuery vehPatrolinInfoQuery = new VehPatrolinInfoQuery(); + vehPatrolinInfoQuery.setSid(sid); + vehPatrolinInfoQuery.setUserSid(userSid); + return scmVehPatrolinspectionmonthService.getCarInspectionReport(vehPatrolinInfoQuery); } @Override - public ResultBean getCarInspectionReport(String sid, String userSid, String orgPath) { - return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid,orgPath); + public ResultBean getCarInspectionReport(VehPatrolinInfoQuery vehPatrolinInfoQuery) { + return scmVehPatrolinspectionmonthService.getCarInspectionReport(vehPatrolinInfoQuery); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java index 20ecc3e63c..7b16153419 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java @@ -178,11 +178,12 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath); if (sysOrganizationVoResultBean.getSuccess()) { SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); @@ -342,6 +344,8 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService getCarInspectionReport(String sid, String userSid, String orgPath) { + public ResultBean getCarInspectionReport(VehPatrolinInfoQuery vehPatrolinInfoQuery) { ResultBean rb = ResultBean.fireFail(); + String sid = vehPatrolinInfoQuery.getSid(); + String userSid = vehPatrolinInfoQuery.getUserSid(); + String orgPath = vehPatrolinInfoQuery.getOrgPath(); AppScmVehPatrolinspectionmonthInfoVo vo = new AppScmVehPatrolinspectionmonthInfoVo(); AppScmVehPatrolinspectionmonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid); if (appScmVehInventorymonthInfoVo != null) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java index 50884e9bc9..1a51ca3190 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java @@ -107,12 +107,14 @@ public class ScmWarehouseRest implements ScmWarehouseFeign { @Override public ResultBean> selectWarehouseByUserSid(String userSid) { - return scmWarehouseService.selectWarehouseByUserSid(userSid, ""); + AppScmWarehouseQuery appScmWarehouseQuery = new AppScmWarehouseQuery(); + appScmWarehouseQuery.setUserSid(userSid); + return scmWarehouseService.selectWarehouseByUserSid(appScmWarehouseQuery); } @Override - public ResultBean> selectWarehouseByUserSid(String userSid, String orgPath) { - return scmWarehouseService.selectWarehouseByUserSid(userSid, orgPath); + public ResultBean> selectWarehouseByUserSid(AppScmWarehouseQuery appScmWarehouseQuery) { + return scmWarehouseService.selectWarehouseByUserSid(appScmWarehouseQuery); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java index 2969505473..82fcd9a937 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java @@ -144,10 +144,14 @@ public class ScmWarehouseService extends MybatisBaseService> selectWarehouseByUserSid(String userSid, String orgPath) { + public ResultBean> selectWarehouseByUserSid(AppScmWarehouseQuery appScmWarehouseQuery) { ResultBean> rb = ResultBean.fireFail(); + String orgPath = appScmWarehouseQuery.getOrgPath(); + String userSid = appScmWarehouseQuery.getUserSid(); if(StringUtils.isBlank(orgPath)){ orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + }else{ + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } List list = baseMapper.selectWarehouseByUserSid(orgPath); return rb.success().setData(list); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java index 0dad35642b..74231fb163 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java @@ -53,8 +53,12 @@ public interface AppBusMainDepositFeign { public ResultBean> getDepositRecords(@PathVariable("depositBillNo") String depositBillNo); @ApiOperation("根据仓库sid 获取车架号") - @GetMapping({"/getVinByWarehouseSid/{warehouseSid}/{userSid}","/getVinByWarehouseSid/{warehouseSid}/{userSid}/{orgPath}"}) - public ResultBean> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid,@PathVariable(value = "orgPath",required = false) String orgPath); + @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}") + public ResultBean> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid); + + @ApiOperation("根据仓库sid 获取车架号") + @GetMapping("/getVinByWarehouseSid") + public ResultBean> getVinByWarehouseSid(@SpringQueryMap AppWarehouseVinQuery appWarehouseVinQuery); @ApiOperation("删除虚拟订单") @DeleteMapping("/deleteVirtualOrder/{virtualOrderSid}/{userSid}") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java index b0f3d5da17..9776a05979 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java @@ -148,7 +148,12 @@ public class AppBusMainDepositFeignFallback implements AppBusMainDepositFeign { } @Override - public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid,String orgPath) { + public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid) { + return null; + } + + @Override + public ResultBean> getVinByWarehouseSid(AppWarehouseVinQuery appWarehouseVinQuery) { return null; } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppWarehouseVinQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppWarehouseVinQuery.java new file mode 100644 index 0000000000..42a28ed263 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppWarehouseVinQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.virtualOrders; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/22 21:19 + * @Description + */ +@Data +public class AppWarehouseVinQuery { + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java index a6dbee8bb2..69ab1c7ce2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java @@ -29,6 +29,7 @@ import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.ResponseBody; @@ -60,9 +61,9 @@ public interface AppScmBaseInfoFeign { @ResponseBody public ResultBean getToDoNum(@PathVariable("userSid") String userSid); - @ApiOperation("获取供应链各业务模块待办数量") - @GetMapping("/getToDoNum/{userSid}/{orgPath}") + @ApiOperation("获取供应链各业务模块待办数量:切换机构") + @GetMapping("/getToDoNum") @ResponseBody - public ResultBean getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + public ResultBean getToDoNum(@SpringQueryMap AppScmBaseInfoQuery baseInfoQuery); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeignFallback.java index 9e97fa33e7..4c438303ba 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeignFallback.java @@ -54,7 +54,7 @@ public class AppScmBaseInfoFeignFallback implements AppScmBaseInfoFeign { } @Override - public ResultBean getToDoNum(String userSid, String orgPath) { + public ResultBean getToDoNum(AppScmBaseInfoQuery baseInfoQuery) { return null; } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoQuery.java new file mode 100644 index 0000000000..84944aab17 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.supplychain.baseInfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/22 15:54 + * @Description + */ +@Data +public class AppScmBaseInfoQuery implements Query { + private static final long serialVersionUID = -340954280690961987L; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java index 1108d93175..660890f95d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java @@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; /** @@ -60,9 +61,9 @@ public interface AppScmVehiclePatrolinspectionFeign { public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid); @ApiOperation("手机端-判断是否生成巡检记录") - @GetMapping("/getInspectionRecords/{userSid}/{orgPath}") + @GetMapping("/getInspectionRecords") @ResponseBody - public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid, @PathVariable("orgPath") String orgPath); + public ResultBean getInspectionRecords(@SpringQueryMap GetRecordsQuery getRecordsQuery); @ApiOperation("手机端-获取巡检报告列表") @PostMapping("/getCarInspectionReportList") @@ -114,7 +115,7 @@ public interface AppScmVehiclePatrolinspectionFeign { @ResponseBody public ResultBean getInspectionInfo(@PathVariable("recordSid") String recordSid); - @ApiOperation("巡检获取车价号") + @ApiOperation("巡检获取车价号:已添加切换机构") @PostMapping("/getInspectionVinList") @ResponseBody public ResultBean> getInspectionVinList(@RequestBody PagerQuery pagerQuery); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java index b5b29f7eb9..2d493daf5f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java @@ -53,7 +53,7 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle } @Override - public ResultBean getInspectionRecords(String userSid, String orgPath) { + public ResultBean getInspectionRecords(GetRecordsQuery getRecordsQuery) { return null; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/GetRecordsQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/GetRecordsQuery.java new file mode 100644 index 0000000000..e212abd6f0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/GetRecordsQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.terminal.api.supplychain.inspection; + +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/22 22:01 + * @Description + */ +@Data +public class GetRecordsQuery { + + private String userSid; + + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java index 836a367024..bce97e9ad6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java @@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; /** @@ -69,7 +70,7 @@ public interface AppScmVehicleInventoryFeign { @ResponseBody public ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("手机端-获取盘库记录列表") + @ApiOperation("手机端-获取盘库记录列表:已添加切换机构") @PostMapping("/getCarInventoryList") @ResponseBody public ResultBean> getCarInventoryList(@RequestBody PagerQuery pagerQuery); @@ -99,7 +100,7 @@ public interface AppScmVehicleInventoryFeign { @ResponseBody public ResultBean getInventoryInfo(@PathVariable("recordSid") String recordSid); - @ApiOperation("手机端-获取盘库报告列表") + @ApiOperation("手机端-获取盘库报告列表:已添加切换机构") @PostMapping("/getCarInventoryReportList") @ResponseBody public ResultBean> getCarInventoryReportList(@RequestBody PagerQuery pagerQuery); @@ -109,6 +110,11 @@ public interface AppScmVehicleInventoryFeign { @ResponseBody public ResultBean getCarInventoryReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid); + @ApiOperation("手机端-获取盘库报告:已添加切换机构") + @GetMapping("/getCarInventoryReport") + @ResponseBody + public ResultBean getCarInventoryReport(@SpringQueryMap VehInventorymonthInfoQuery vehInventorymonthInfoQuery); + @ApiOperation("发送报告") @PostMapping("/sendReport") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java index ace18ec53e..5afe1ed3b6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java @@ -101,6 +101,11 @@ public class AppScmVehicleInventoryFeignFallback implements AppScmVehicleInvento return null; } + @Override + public ResultBean getCarInventoryReport(VehInventorymonthInfoQuery vehInventorymonthInfoQuery) { + return null; + } + @Override public ResultBean sendReport(VehInventoryreportDto dto) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoQuery.java new file mode 100644 index 0000000000..fdf6c0ac9f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.supplychain.inventory; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/22 22:30 + * @Description + */ +@Data +public class VehInventorymonthInfoQuery { + + private String sid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppScmVehicleEnterlibraryFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppScmVehicleEnterlibraryFeign.java index 273629bf29..f01c5a50ff 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppScmVehicleEnterlibraryFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppScmVehicleEnterlibraryFeign.java @@ -54,7 +54,7 @@ import org.springframework.web.bind.annotation.*; fallback = AppScmVehicleEnterlibraryFeignFallback.class) public interface AppScmVehicleEnterlibraryFeign { - @ApiOperation("手机端-获取车辆入库列表") + @ApiOperation("手机端-获取车辆入库列表:已添加切换机构") @PostMapping("/getCarWarehousingList") @ResponseBody public ResultBean> getCarWarehousingList(@RequestBody PagerQuery pagerQuery); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java index 7cae39e737..bd25403c19 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java @@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.*; fallback = AppScmVehicleExamineFeignFallback.class) public interface AppScmVehicleExamineFeign { - @ApiOperation("手机端-获取验车管理列表") + @ApiOperation("手机端-获取验车管理列表:已添加切换机构") @PostMapping("/getCarInspectedList") @ResponseBody ResultBean> getCarInspectedList(@RequestBody PagerQuery pagerQuery); @@ -45,7 +45,7 @@ public interface AppScmVehicleExamineFeign { @ResponseBody public ResultBean saveCarInspectedInfo(@RequestBody AppExamineDto dto); - @ApiOperation("手机端-通过验车单") + @ApiOperation("手机端-通过验车单：已添加切换机构") @PostMapping("/submitCarInspectedInfo") @ResponseBody public ResultBean submitCarInspectedInfo(@RequestBody AppSubmitDto dto); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java index ee459a1cfd..1119b322a8 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java @@ -112,9 +112,9 @@ public class AppGressionInfoVo implements Vo { @JsonProperty("personSid") private String personUserSid; - @ApiModelProperty("机构sid") + /* @ApiModelProperty("机构sid") @JsonProperty("orgPath") - private String useOrgSid; + private String useOrgSid;*/ } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java index fb08f9c1af..69260e708a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java @@ -97,7 +97,7 @@ public interface AppScmVehicleGressionFeign { public ResultBean getErtraState(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid); - @ApiOperation("提交流程") + @ApiOperation("提交流程：已添加切换机构") @PostMapping("/submitCarTransferInfo") @ResponseBody ResultBean submitCarTransferInfo(@RequestBody SubmitGressionDto dto); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java index 4cb326fdc6..7f03b0d03a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.autoservice.virtualOrders; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppBusMainDepositFeign; +import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppWarehouseVinQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*; @@ -91,16 +92,22 @@ public class AppBusMainDepositRest implements AppBusMainDepositFeign { return appBusMainDepositService.getDepositRecords(depositBillNo); } + @Override + public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid) { + AppWarehouseVinQuery appWarehouseVinQuery = new AppWarehouseVinQuery(); + appWarehouseVinQuery.setWarehouseSid(warehouseSid); + appWarehouseVinQuery.setUserSid(userSid); + return appBusMainDepositService.getVinByWarehouseSid(appWarehouseVinQuery); + } + /** * 根据仓库sid 获取车架号 * - * @param warehouseSid - * @param userSid * @return */ @Override - public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid,String orgPath) { - return appBusMainDepositService.getVinByWarehouseSid(warehouseSid, userSid,orgPath); + public ResultBean> getVinByWarehouseSid(AppWarehouseVinQuery appWarehouseVinQuery) { + return appBusMainDepositService.getVinByWarehouseSid(appWarehouseVinQuery); } /** diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java index 6443f803cf..183f85521d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java @@ -30,6 +30,7 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo; import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.app.GetVinQuery; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositDetailInfoQuery; @@ -42,6 +43,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositQuery; import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo; import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.*; +import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppWarehouseVinQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*; @@ -53,6 +55,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -147,14 +150,14 @@ public class AppBusMainDepositService { /** * 根据仓库sid 获取车架号 * - * @param warehouseSid - * @param userSid * @return */ - public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) { + public ResultBean> getVinByWarehouseSid(AppWarehouseVinQuery appWarehouseVinQuery) { ResultBean> rb = ResultBean.fireFail(); + GetVinQuery getVinQuery = new GetVinQuery(); + BeanUtil.copyProperties(appWarehouseVinQuery, getVinQuery); List list = new ArrayList<>(); - ResultBean> resultBean = baseVehicleFeign.getVinByWarehouseSid(warehouseSid, userSid, orgPath); + ResultBean> resultBean = baseVehicleFeign.getVinByWarehouseSid(getVinQuery); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoRest.java index 79b2207694..3ebecbbedd 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoRest.java @@ -26,6 +26,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.AppScmBaseInfoQuery; import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; @@ -54,11 +55,13 @@ public class AppScmBaseInfoRest implements AppScmBaseInfoFeign { @Override public ResultBean getToDoNum(String userSid) { - return appScmBaseInfoService.getToDoNum(userSid,""); + AppScmBaseInfoQuery baseInfoQuery = new AppScmBaseInfoQuery(); + baseInfoQuery.setUserSid(userSid); + return appScmBaseInfoService.getToDoNum(baseInfoQuery); } @Override - public ResultBean getToDoNum(String userSid, String orgPath) { - return appScmBaseInfoService.getToDoNum(userSid,orgPath); + public ResultBean getToDoNum(AppScmBaseInfoQuery baseInfoQuery) { + return appScmBaseInfoService.getToDoNum(baseInfoQuery); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoService.java index 17d9e6a56d..d52b276638 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoService.java @@ -1,10 +1,12 @@ package com.yxt.anrui.terminal.biz.supplychain.baseInfo; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign; import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign; import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign; +import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoQuery; import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; @@ -26,7 +28,9 @@ public class AppScmBaseInfoService { ScmVehiclePatrolinspectionFeign scmVehiclePatrolinspectionFeign; - public ResultBean getToDoNum(String userSid, String orgPath) { + public ResultBean getToDoNum(AppScmBaseInfoQuery baseInfoQuery) { + String orgPath = baseInfoQuery.getOrgPath(); + String userSid = baseInfoQuery.getUserSid(); ResultBean rb = ResultBean.fireFail(); AppScmBaseInfoVo appScmBaseInfoVo = new AppScmBaseInfoVo(); String inspectedCarNum = ""; @@ -41,11 +45,16 @@ public class AppScmBaseInfoService { 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(); + //切换机构 + AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery(); + appToDoNumQuery.setUserSid(userSid); + appToDoNumQuery.setOrgPath(orgPath); + //验车待办数量 + inspectedCarNum = scmVehicleExamineFeign.getToDoNum(appToDoNumQuery).getData(); + storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(appToDoNumQuery).getData(); + moveCarNum = scmVehicleGressionFeign.getToDoNum(appToDoNumQuery).getData(); + inventoryCarNum = scmVehicleInventoryFeign.getToDoNum(appToDoNumQuery).getData(); + inspectinoCarNum = scmVehiclePatrolinspectionFeign.getToDoNum(appToDoNumQuery).getData(); } appScmBaseInfoVo.setInspectedCarNum(inspectedCarNum); appScmBaseInfoVo.setStorageCarNum(storageCarNum); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java index 5fa79a54c5..aba0a2e88d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java @@ -73,8 +73,8 @@ public class CompanyShuntingService { //用户的组织全路径 String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath); - }else{ - baseInterNalPurchaseCompleteDto.setOrgPath(orgPath); + } else { + baseInterNalPurchaseCompleteDto.setOrgSidPath(orgPath); } @@ -94,7 +94,7 @@ public class CompanyShuntingService { }); Map map = new HashMap<>(); String orgPath = dto.getOrgPath(); - if(StringUtils.isBlank(orgPath)){ + if (StringUtils.isBlank(orgPath)) { //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); if (!userVoResultBean.getSuccess()) { @@ -108,8 +108,8 @@ public class CompanyShuntingService { //用户的组织全路径 String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath); - }else{ - baseInterNalPurchaseCompleteDto.setOrgPath(orgPath); + } else { + baseInterNalPurchaseCompleteDto.setOrgSidPath(orgPath); } map.put("baseInternalPurchaseVehicles", list2); @@ -128,16 +128,21 @@ public class CompanyShuntingService { if (!userVoResultBean.getSuccess()) { return rb.setMsg(userVoResultBean.getMsg()); } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } - //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + String orgPath = dto.getOrgPath(); BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); - baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath); + if (StringUtils.isBlank(orgPath)) { + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + orgPath = staffOrgResultBean.getData().getOrgSidPath(); + baseInterNalPurchaseCompleteDto.setOrgSidPath(orgPath); + } else { + baseInterNalPurchaseCompleteDto.setOrgSidPath(orgPath); + } ResultBean resultBean = baseInternalPurchaseFeign.InitiatorToAnswer(baseInterNalPurchaseCompleteDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -147,21 +152,24 @@ public class CompanyShuntingService { public ResultBean companyToDivisionOperateInfo(CompanyShuntingDto dto) { ResultBean rb = ResultBean.fireFail(); - //根据用户sid获取staffSid - ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } - //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); - baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath); + String orgPath = dto.getOrgPath(); + if(StringUtils.isBlank(orgPath)){ + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgPath = staffOrgResultBean.getData().getOrgSidPath(); + + } + baseInterNalPurchaseCompleteDto.setOrgSidPath(orgPath); ResultBean resultBean = baseInternalPurchaseFeign.companyToDivisionOperate(baseInterNalPurchaseCompleteDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseService.java index e7304c12bf..58d533081d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseService.java @@ -69,12 +69,8 @@ public class ExternalPurchaseService { } //用户的组织全路径 String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); - businessVariablesDto.setOrgSidPath(orgSidPath); - } else { - businessVariablesDto.setOrgPath(orgPath); } - - + businessVariablesDto.setOrgSidPath(orgPath); ResultBean resultBean = baseOutsourcingApplicationFeign.complete(businessVariablesDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java index 77a1601bc2..c1238081b7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java @@ -62,8 +62,8 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins } @Override - public ResultBean getInspectionRecords(String userSid, String orgPath) { - return appScmVehiclePatrolinspectionService.getInspectionRecords(userSid,orgPath); + public ResultBean getInspectionRecords(GetRecordsQuery getRecordsQuery) { + return appScmVehiclePatrolinspectionService.getInspectionRecords(getRecordsQuery); } @Override diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java index c6d70f310e..2253097cdf 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java @@ -29,22 +29,20 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.InspectionVinQuery; import com.yxt.anrui.base.api.basevehicle.InspectionVinVo; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetFeign; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionFeign; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppScmVehPatrolinspectionmonthInfoVo; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppScmVehPatrolinspectionmonthQuery; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppScmVehPatrolinspectionmonthVo; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthFeign; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*; import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportDto; import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportFeign; +import com.yxt.anrui.terminal.api.supplychain.inspection.VehPatrolinspectionmonthVo; import com.yxt.anrui.terminal.api.supplychain.inspection.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; @@ -88,8 +86,11 @@ public class AppScmVehiclePatrolinspectionService { return resultBean; } - public ResultBean getInspectionRecords(String userSid, String orgPath) { - ResultBean resultBean = scmVehPatrolinspectionmonthFeign.getInspectionRecords(userSid, orgPath); + public ResultBean getInspectionRecords(GetRecordsQuery getRecordsQuery) { + VehRecordsQuery vehRecordsQuery = new VehRecordsQuery(); + vehRecordsQuery.setOrgPath(getRecordsQuery.getOrgPath()); + vehRecordsQuery.setUserSid(getRecordsQuery.getUserSid()); + ResultBean resultBean = scmVehPatrolinspectionmonthFeign.getInspectionRecords(vehRecordsQuery); return resultBean; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java index a87594df44..3b9302e219 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java @@ -112,6 +112,11 @@ public class AppScmVehicleInventoryRest implements AppScmVehicleInventoryFeign { return appScmVehicleInventoryService.getCarInventoryReport(sid, userSid); } + @Override + public ResultBean getCarInventoryReport(VehInventorymonthInfoQuery vehInventorymonthInfoQuery) { + return appScmVehicleInventoryService.getCarInventoryReport(vehInventorymonthInfoQuery); + } + @Override public ResultBean sendReport(VehInventoryreportDto dto) { return appScmVehicleInventoryService.sendReport(dto); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java index 992f7b4a70..46598190ae 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java @@ -28,10 +28,7 @@ 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.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.scmvehinventorymonth.*; import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDto; import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportFeign; import com.yxt.anrui.terminal.api.supplychain.inventory.*; @@ -227,6 +224,21 @@ public class AppScmVehicleInventoryService { return rb.success().setData(vo); } + public ResultBean getCarInventoryReport(VehInventorymonthInfoQuery vehInventorymonthInfoQuery) { + ResultBean rb = ResultBean.fireFail(); + VehInventorymonthInfoVo vo = new VehInventorymonthInfoVo(); + AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery = new AppScmVehInventorymonthInfoQuery(); + appScmVehInventorymonthInfoQuery.setSid(vehInventorymonthInfoQuery.getSid()); + appScmVehInventorymonthInfoQuery.setUserSid(vehInventorymonthInfoQuery.getUserSid()); + ResultBean resultBean = scmVehInventorymonthFeign.getCarInventoryReport(appScmVehInventorymonthInfoQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + AppScmVehInventorymonthInfoVo appScmVehInventorymonthInfoVo = resultBean.getData(); + BeanUtil.copyProperties(appScmVehInventorymonthInfoVo, vo); + return rb.success().setData(vo); + } + public ResultBean sendReport(VehInventoryreportDto dto) { ScmVehInventoryreportDto scmVehInventoryreportDto = new ScmVehInventoryreportDto(); BeanUtil.copyProperties(dto, scmVehInventoryreportDto); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java index f9b22d6724..f14ff10af0 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java @@ -124,13 +124,10 @@ public class AppBaseModelModpriceService { return rb.setMsg(staffOrgResultBean.getMsg()); } //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); - baseModelModPriceCompleteDto.setOrgSidPath(orgSidPath); - }else{ - baseModelModPriceCompleteDto.setOrgPath(orgPath); + orgPath = staffOrgResultBean.getData().getOrgSidPath(); } - + baseModelModPriceCompleteDto.setOrgSidPath(orgPath); ResultBean resultBean = baseModelModpriceFeign.complete(baseModelModPriceCompleteDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/purchaseReturn/AppScmVehicleReturnService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/purchaseReturn/AppScmVehicleReturnService.java index b4aa23f46f..76eef131ad 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/purchaseReturn/AppScmVehicleReturnService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/purchaseReturn/AppScmVehicleReturnService.java @@ -195,12 +195,10 @@ public class AppScmVehicleReturnService { return rb.setMsg(staffOrgResultBean.getMsg()); } //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); - scmVehicleReturnFlowQuery.setOrgSidPath(orgSidPath); - } else { - scmVehicleReturnFlowQuery.setOrgPath(orgPath); - } + orgPath = staffOrgResultBean.getData().getOrgSidPath(); + } + scmVehicleReturnFlowQuery.setOrgSidPath(orgPath); ResultBean resultBean = scmVehicleReturnFeign.complete(scmVehicleReturnFlowQuery); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java index c0403eae1f..0dece2a7d5 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java @@ -172,7 +172,7 @@ public class AppScmVehicleGressionService { String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); scmCarTransferCompleteDto.setOrgSidPath(orgSidPath); } else { - scmCarTransferCompleteDto.setOrgPath(orgPath); + scmCarTransferCompleteDto.setOrgSidPath(orgPath); } ResultBean resultBean = scmVehicleGressionFeign.complete(scmCarTransferCompleteDto); if (!resultBean.getSuccess()) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutService.java index fdd7abbe5d..95d1bb68c2 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutService.java @@ -68,11 +68,10 @@ public class UnsoldBuyoutService { return rb.setMsg(staffOrgResultBean.getMsg()); } //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); - baseActualSalesCompleteDto.setOrgSidPath(orgSidPath); - } else { - baseActualSalesCompleteDto.setOrgPath(orgPath); + orgPath = staffOrgResultBean.getData().getOrgSidPath(); + } + baseActualSalesCompleteDto.setOrgSidPath(orgPath); ResultBean resultBean = baseVehicleActualSalesFeign.complete(baseActualSalesCompleteDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java index 740e10747e..3fedf6c028 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java @@ -79,11 +79,9 @@ public class VehicleApplyService { return rb.setMsg(staffOrgResultBean.getMsg()); } //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); - busVehicleApplyCompleteDto.setOrgSidPath(orgSidPath); - } else { - busVehicleApplyCompleteDto.setOrgPath(orgPath); + orgPath = staffOrgResultBean.getData().getOrgSidPath(); } + busVehicleApplyCompleteDto.setOrgSidPath(orgPath); ResultBean resultBean = busVehicleApplyFeign.complete(busVehicleApplyCompleteDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg());