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 e873e71598..6852a1556e 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 @@ -67,4 +67,8 @@ public interface BaseDiscountpackageFeign { @ApiOperation("移动端-销售订单获取销售政策优惠包") @GetMapping("/getAppPackage/{userSid}") ResultBean> getAppPackage(@PathVariable(value = "userSid") String userSid); + + @ApiOperation("移动端-销售订单获取销售政策优惠包:切换机构") + @GetMapping("/getAppPackage/{userSid}/{orgPath}") + ResultBean> getAppPackage(@PathVariable(value = "userSid") String userSid,@PathVariable(value = "orgPath") String orgPath); } \ 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 903cee4216..79e455bd74 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 @@ -66,5 +66,10 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig return null; } + @Override + public ResultBean> getAppPackage(String userSid, String orgPath) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java index 534ed332c0..05ea0e1b64 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java @@ -16,4 +16,7 @@ public class BaseMiddleQuery implements Query { private String name; @ApiModelProperty("参数错误：userSid不能为空") private String userSid; + + @ApiModelProperty("组织机构sid") + private String orgPath; } 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 e978e3a290..0f28183d9a 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 @@ -4,6 +4,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; +import com.yxt.anrui.base.api.basevehicle.app.VinQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -357,6 +358,10 @@ public interface BaseVehicleFeign { @GetMapping("/getVins/{modelSid}/{configSid}/{userSid}") public ResultBean> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid); + @ApiOperation("获取车架号") + @PostMapping("/getVins") + public ResultBean> getVins(@RequestBody VinQuery vinQuery); + /** * 2020-06-16已整理 * 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 6e32a8c8fd..7a34c21d8e 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 @@ -4,6 +4,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; +import com.yxt.anrui.base.api.basevehicle.app.VinQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -258,6 +259,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> getVins(VinQuery vinQuery) { + return null; + } + @Override public ResultBean getModelList(PagerQuery pagerQuery) { return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/getModelList无法访问"); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinQuery.java index 89c82da2c9..126c2e5008 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinQuery.java @@ -15,4 +15,8 @@ public class InspectionVinQuery implements Query { @ApiModelProperty("分公司sid") private String useOrgSid; + + @ApiModelProperty("组织机构sid") + private String orgPath; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java new file mode 100644 index 0000000000..9390b09e71 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.base.api.basevehicle.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/20 23:16 + * @Description + */ +@Data +public class VinQuery implements Query { + private static final long serialVersionUID = 1891967483035764368L; + + private String modelSid; + private String configSid; + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} 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 d1da537b7d..22799f6463 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 @@ -114,6 +114,10 @@ public interface BaseVehicleBrandFeign { @GetMapping("/selectAppListByUserSid/{userSid}") ResultBean> selectAppListByUserSid(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-获取品牌数据字典:切换组织机构") + @GetMapping("/selectAppListByUserSid/{userSid}/{orgPath}") + ResultBean> selectAppListByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + @ApiOperation("根据品牌sid获取品牌信息") @GetMapping("/fetchBySid/{sid}") BaseVehicleBrand fetchBySid(@RequestParam("sid") String 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 0388562c29..d9718ba16d 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 @@ -81,6 +81,11 @@ public class BaseVehicleBrandFeignFallback implements BaseVehicleBrandFeign { return null; } + @Override + public ResultBean> selectAppListByUserSid(String userSid, String orgPath) { + return null; + } + @Override public BaseVehicleBrand fetchBySid(String sid) { return null; 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 806dd62e2a..5838b49145 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,7 +2,6 @@ package com.yxt.anrui.base.biz.basediscountpackage; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basediscountpackage.*; -import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -132,7 +131,12 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign { @Override public ResultBean> getAppPackage(String userSid) { - return baseDiscountpackageService.getAppPackage(userSid); + return baseDiscountpackageService.getAppPackage(userSid,""); + } + + @Override + public ResultBean> getAppPackage(String userSid, String orgPath) { + return baseDiscountpackageService.getAppPackage(userSid,orgPath); } } 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 4f94f1dcbc..59edc77ece 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 @@ -7,9 +7,7 @@ import com.yxt.anrui.base.api.basediscountpackage.*; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; -import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.service.MybatisBaseService; @@ -212,7 +210,7 @@ public class BaseDiscountpackageService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); @@ -242,7 +240,7 @@ public class BaseDiscountpackageService extends MybatisBaseService> getAppPackage(String userSid) { + public ResultBean> getAppPackage(String userSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(userSid)) { - //根据申请人sid查询分公司sid - String orgSid = ""; - ResultBean stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - if (stringResultBean.getSuccess()) { - orgSid = stringResultBean.getData(); + if (StringUtils.isBlank(orgPath)) { + if (StringUtils.isNotBlank(userSid)) { + //根据申请人sid查询分公司sid + ResultBean stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + if (stringResultBean.getSuccess()) { + orgPath = stringResultBean.getData(); + } + qw.lambda().apply("FIND_IN_SET ('" + orgPath + "',useOrg)"); } - qw.lambda().apply("FIND_IN_SET ('" + orgSid + "',useOrg)"); - qw.eq("salesPolicyKey", "0002"); + } else { + qw.lambda().apply("FIND_IN_SET ('" + orgPath + "',useOrg)"); } + qw.eq("salesPolicyKey", "0002"); List voList = baseMapper.getAppPackage(qw); if (voList.isEmpty()) { voList = new ArrayList<>(); 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 7480d015d3..f120609fe1 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 @@ -116,10 +116,15 @@ public class BaseMiddlemanService extends MybatisBaseService qw = new QueryWrapper<>(); if (params != null) { - if (StringUtils.isNotBlank(params.getUserSid())) { - ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()); - qw.eq("useOrgSid", resultBean.getData()); + if(StringUtils.isBlank(params.getOrgPath())){ + if (StringUtils.isNotBlank(params.getUserSid())) { + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()); + qw.eq("useOrgSid", resultBean.getData()); + } + }else{ + qw.eq("useOrgSid", params.getOrgPath()); } + } IPage pagging = baseMapper.getMiddleList(page, qw, params.getName()); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index c4b2e89dc5..4379c96190 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -15,6 +15,7 @@ import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; +import com.yxt.anrui.base.api.basevehicle.app.VinQuery; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; @@ -866,7 +867,17 @@ public class BaseVehicleRest implements BaseVehicleFeign { */ @Override public ResultBean> getVins(String modelSid, String configSid, String userSid) { - List vo = baseVehicleService.getVins(modelSid, configSid, userSid); + List vo = baseVehicleService.getVins(modelSid, configSid, userSid,""); + return new ResultBean>().success().setData(vo); + } + + @Override + public ResultBean> getVins(VinQuery vinQuery) { + String modelSid = vinQuery.getModelSid(); + String configSid = vinQuery.getConfigSid(); + String userSid = vinQuery.getUserSid(); + String orgPath = vinQuery.getOrgPath(); + List vo = baseVehicleService.getVins(modelSid, configSid, userSid,orgPath); return new ResultBean>().success().setData(vo); } 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 71cc0f6372..95bc8c3603 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 @@ -1060,9 +1060,11 @@ public class BaseVehicleService extends MybatisBaseService getVins(String modelSid, String configSid, String userSid) { - String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - List vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid); + public List getVins(String modelSid, String configSid, String userSid, String orgPath) { + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + List vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath); if (vins.size() <= 0) { for (AppVinsDetailsVo vin : vins) { vins.add(vin); @@ -2908,14 +2910,23 @@ public class BaseVehicleService extends MybatisBaseService getInspectionVinList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); - pagerQuery.getParams().setUseOrgSid(useOrgSid); + InspectionVinQuery params = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.like("bv.vinNo", pagerQuery.getParams().getName()); - qw.eq("bv.createOrgSid", pagerQuery.getParams().getUseOrgSid()); + if (params != null) { + String orgPath = params.getOrgPath(); + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + } + params.setUseOrgSid(orgPath); + if (StringUtils.isNotBlank(params.getName())) { + qw.like("bv.vinNo", params.getName()); + } + if (StringUtils.isNotBlank(params.getUseOrgSid())) { + qw.eq("bv.createOrgSid", params.getUseOrgSid()); + } + } qw.eq("bv.isDelete", 0); qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); -// qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); IPage iPage = baseMapper.getInspectionVinList(page, qw); for (InspectionVinVo record : iPage.getRecords()) { String addressSid = record.getAddressSid(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java index c1aaccdf15..160a94a955 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java @@ -173,7 +173,13 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign { @Override public ResultBean> selectAppListByUserSid(String userSid) { - List list = baseVehicleBrandService.selectAppListByUserSid(userSid); + List list = baseVehicleBrandService.selectAppListByUserSid(userSid,""); + return new ResultBean>().success().setData(list); + } + + @Override + public ResultBean> selectAppListByUserSid(String userSid, String orgPath) { + List list = baseVehicleBrandService.selectAppListByUserSid(userSid,orgPath); 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 f657acdd24..50ebf9da13 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 @@ -222,9 +222,11 @@ public class BaseVehicleBrandService extends MybatisBaseService selectAppListByUserSid(String userSid) { - String useOrg = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - List list = baseMapper.selectAppListByUserSid(useOrg); + public List selectAppListByUserSid(String userSid,String orgPath) { + if(StringUtils.isBlank(orgPath)){ + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + List list = baseMapper.selectAppListByUserSid(orgPath); return list; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempQuery.java index f629aa2929..0082e1b20e 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempQuery.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempQuery.java @@ -35,4 +35,7 @@ public class AppCrmCustomerTempQuery implements Query { @ApiModelProperty("客户分类key") private String customerClassKey; + @ApiModelProperty("组织机构sid") + private String orgPath; + } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java index 2105142b36..df506cdc41 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java @@ -57,7 +57,7 @@ public interface CrmCustomerTempMapper extends BaseMapper { * @param name * @return */ - IPage getCustomerTempListByUserSid(IPage page, @Param("staffSid") String staffSid, @Param("name") String name); + IPage getCustomerTempListByUserSid(IPage page, @Param(Constants.WRAPPER) Wrapper qw); CrmCustomerTempVo selectByMobileOrWx(Map map); @@ -73,7 +73,7 @@ public interface CrmCustomerTempMapper extends BaseMapper { * 根据客户的手机号以及当前登录者所在部门的sid查询该部门内是否有重复的 * * @param staffSid 当前登录者staffSId - * @param mobile 手机号 + * @param mobile 手机号 * @return */ CrmCustomerTempVo selectByMobile(@Param("staffSid") String staffSid, @Param("mobile") String mobile); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index a5026adcf2..195e6c2259 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -44,11 +44,9 @@ cct.follow_state FROM crm_customer_temp cct LEFT JOIN crm_visit cv ON cct.sid = cv.customerSid - WHERE cct.staffSid = #{staffSid} - - AND cct.name LIKE concat('%', #{name}, '%') - - order BY cct.id DESC + + ${ew.sqlSegment} + + + \ No newline at end of file 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 8afbc56ccb..973575d046 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 @@ -285,4 +285,8 @@ public class SysStaffOrgService extends MybatisBaseService selectOrgBySid(String orgPath, String staffSid) { + return baseMapper.selectOrgBySid(orgPath,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.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java index 06a94a95b1..0576a86d59 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 @@ -59,4 +59,6 @@ public interface SysStaffPostMapper extends BaseMapper { SysStaffPostDetailsVo getPostByStaffSid(String sid); String selectPost(String sid); + + List getPost(String userSid); } \ 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 683d59f056..2d590904dd 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 @@ -50,4 +50,12 @@ left join sys_role sr on sp.parentSid = sr.postSid where ssp.staffSid = #{sid} + + \ 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 e74355d1e5..955e8e7ede 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 @@ -135,4 +135,8 @@ public class SysStaffPostService extends MybatisBaseService getPost(String userSid) { + return baseMapper.getPost(userSid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index b1dfc00dee..8d1ba714e9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -1117,4 +1117,12 @@ public class SysUserService extends MybatisBaseService { } return rb.success().setData(isTrue); } + + public List selectOrgBySid(String orgPath, String staffSid) { + return sysStaffOrgService.selectOrgBySid(orgPath,staffSid); + } + + public List getPost(String userSid) { + return sysStaffPostService.getPost(userSid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java index 72d8ffadeb..1eada849ee 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.auth0.jwt.JWT; import com.auth0.jwt.interfaces.DecodedJWT; import com.yxt.anrui.portal.api.sysexceptionlog.SysExceptionLog; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.systemlog.SystemLog; import com.yxt.anrui.portal.api.sysuser.SysUser; import com.yxt.anrui.portal.api.sysuser.SysUserQuery; @@ -18,14 +19,15 @@ import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.*; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -277,6 +279,37 @@ public class AppSysUserRest implements AppSysUserFeign { return new ResultBean().success().setData(userInfo); } + @Override + public ResultBean getMyInfo(String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + SysUserVo sysUserVo = sysUserService.fetchBySidVo(userSid); + if (null == sysUserVo) rb.setMsg("信息错误"); + AppMySysUserInfo userInfo = new AppMySysUserInfo(); + String headImage = ""; + if (StringUtils.isNotBlank(sysUserVo.getHeadImage())) { + headImage = fileUploadComponent.getUrlPrefix() + sysUserVo.getHeadImage(); + } + userInfo.setHeadImage(headImage); + userInfo.setName(StringUtils.isBlank(sysUserVo.getName()) ? "" : sysUserVo.getName()); + userInfo.setId("ID：" + sysUserVo.getId()); + //根据组织机构sid查询该用户的职位以及分公司的部门 + List strings = new ArrayList<>(); + List list = sysUserService.selectOrgBySid(orgPath,sysUserVo.getStaffSid()); + for (SysStaffOrg s : list){ + String orgName = s.getOrgName(); + strings.add(orgName); + } + if(!strings.isEmpty()){ + userInfo.setDepartment(String.join("|",strings)); + } + //根据用户sid查询岗位 + List stringList = sysUserService.getPost(userSid); + if(!stringList.isEmpty()){ + userInfo.setPosition(String.join("|",stringList)); + } + return new ResultBean().success().setData(userInfo); + } + @Override public ResultBean updatePassword(String userSid, String appId, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java index 2d45cafdcb..0bd771b8bc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java @@ -25,18 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmvehicleenterlibrary; -import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto; -import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: scm(scm)
* File: ScmVehicleEnterlibraryFeign.java
@@ -108,4 +104,9 @@ public interface ScmVehicleEnterlibraryFeign { @ResponseBody public ResultBean getToDoNum(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-查询本分公司下代办数量:切换机构") + @GetMapping("/getToDoNum/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java index 7c774ee0ce..2146747147 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java @@ -101,4 +101,9 @@ public class ScmVehicleEnterlibraryFeignFallback implements ScmVehicleEnterlibra public ResultBean getToDoNum(String userSid) { return null; } + + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java index a47cec98b5..4f730c2c0b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java @@ -113,4 +113,9 @@ public interface ScmVehicleExamineFeign { @GetMapping("/getToDoNum/{userSid}") @ResponseBody public ResultBean getToDoNum(@PathVariable("userSid") String userSid); + + @ApiOperation("手机端-查询本分公司下代办数量") + @GetMapping("/getToDoNum/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java index a1424df2d4..12e21ad67c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java @@ -107,4 +107,9 @@ public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign { public ResultBean getToDoNum(String userSid) { return null; } + + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java index a43bfc7c75..d88d6fcb10 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java @@ -142,6 +142,11 @@ public interface ScmVehicleGressionFeign { @ResponseBody public ResultBean getToDoNum(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-查询本分公司下代办数量") + @GetMapping("/getToDoNum/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + @ApiOperation("手机端-获取保险、临牌状态") @GetMapping("/getErtraState/{sid}/{userSid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java index f18f3cd332..807bf6ffc4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java @@ -132,6 +132,11 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign return null; } + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return null; + } + @Override public ResultBean getErtraState(String sid, String userSid) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageQuery.java index b6a7ac3b1c..135935462e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageQuery.java @@ -37,4 +37,7 @@ public class AppScmVehicleCarInventoryListPageQuery implements Query { @ApiModelProperty("使用组织分公司sid") private String useOrgSid; + @ApiModelProperty("组织机构sid") + private String orgPath; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java index bdc6a05c8a..33f5d922e2 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java @@ -110,4 +110,6 @@ public class AppScmVehicleStayInventoryDto implements Dto { @ApiModelProperty("定位经纬度") private String addressCode; + private String orgPath; + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java index 59b134a48f..bd8c086f80 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java @@ -124,4 +124,9 @@ public interface ScmVehicleInventoryFeign { @ResponseBody public ResultBean getToDoNum(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-查询本分公司下代办数量:切换机构") + @GetMapping("/getToDoNum/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java index fd63d33de2..65dbe32387 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java @@ -121,4 +121,9 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig return null; } + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return null; + } + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java index df2329b517..2c9b45d7ed 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java @@ -38,4 +38,7 @@ public class AppScmVehiclePatrolinspectionPageQuery implements Query { @ApiModelProperty("分公司sid") private String useOrgSid; + @ApiModelProperty("组织机构sid") + private String orgPath; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java index 6193fcde25..27c7b8d190 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java @@ -96,4 +96,9 @@ public interface ScmVehiclePatrolinspectionFeign { @ResponseBody public ResultBean getToDoNum(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-查询本分公司下代办数量:切换机构") + @GetMapping("/getToDoNum/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java index 994f5b1581..1ebb6c9a69 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java @@ -90,4 +90,9 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol return null; } + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return null; + } + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java index af960ebebb..6eba38d641 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java @@ -63,4 +63,6 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo { @ApiModelProperty("存放地点") private String warehouse; + + private String orgPath; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java index 5ee5cdb922..9e961e7b80 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java @@ -26,9 +26,7 @@ package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet; -import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -102,4 +100,7 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto { private String warehouse; @ApiModelProperty("推送状态 0 未推送 1 已推送") private int pushState; + + @ApiModelProperty("组织机构sid") + private String orgPath; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java index 1d58593419..17a330be64 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java @@ -7,6 +7,7 @@ import lombok.Data; @Data public class AppScmVehicleStayPatrolinspectionPageQuery implements Query { + private static final long serialVersionUID = -4646685787956672629L; @ApiModelProperty("用户sid") private String userSid; @@ -19,4 +20,7 @@ public class AppScmVehicleStayPatrolinspectionPageQuery implements Query { @ApiModelProperty("分公司sid") private String useOrgSid; + @ApiModelProperty("组织机构sid") + private String orgPath; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java index 4326ce4092..eb4fb3ba2e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java @@ -70,4 +70,7 @@ public class AppScmVehInventorymonthQuery implements Query { @JsonProperty("InventEndDate") private String InventEndDate; + @ApiModelProperty("组织机构sid") + private String orgPath; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java index 14891ca9ae..c1d1a85fa9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java @@ -83,6 +83,11 @@ public interface ScmVehInventorymonthFeign { @ResponseBody public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-生成盘库记录:切换机构") + @GetMapping("/getInventoryRecords/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + @ApiOperation("手机端-获取盘库报告列表") @PostMapping("/getCarInventoryReportList") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java index 8630b202df..0513358363 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java @@ -76,6 +76,11 @@ public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFe return null; } + @Override + public ResultBean getInventoryRecords(String userSid, String orgPath) { + return null; + } + @Override public ResultBean> getCarInventoryReportList(PagerQuery pagerQuery) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthQuery.java index 9ae483ab71..dcd96447cd 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthQuery.java @@ -36,4 +36,7 @@ public class AppScmVehPatrolinspectionmonthQuery implements Query { @JsonProperty("InventEndDate") private String InventEndDate; + @ApiModelProperty("组织机构sid") + private String orgPath; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java index b75907c0c6..a67e545b7e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java @@ -25,20 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth; -import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo; -import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthQuery; -import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: aaa(aaa)
* File: ScmVehPatrolinspectionmonthFeign.java
@@ -85,6 +79,11 @@ public interface ScmVehPatrolinspectionmonthFeign { @ResponseBody public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-判断是否生成巡检记录:切换机构") + @GetMapping("/getInspectionRecords/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + @ApiOperation("手机端-获取巡检报告列表") @PostMapping("/getCarInspectionReportList") @ResponseBody @@ -95,4 +94,9 @@ public interface ScmVehPatrolinspectionmonthFeign { @ResponseBody public ResultBean getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid); + @ApiOperation("手机端-获取巡检报告:切换组织机构") + @GetMapping("/getCarInspectionReport/{sid}/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java index c7115c89fb..4f382467b1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java @@ -75,6 +75,11 @@ public class ScmVehPatrolinspectionmonthFeignFallback implements ScmVehPatrolins return null; } + @Override + public ResultBean getInspectionRecords(String userSid, String orgPath) { + return null; + } + @Override public ResultBean> getCarInspectionReportList(PagerQuery pagerQuery) { return null; @@ -84,4 +89,9 @@ public class ScmVehPatrolinspectionmonthFeignFallback implements ScmVehPatrolins public ResultBean getCarInspectionReport(String sid,String userSid) { return null; } + + @Override + public ResultBean getCarInspectionReport(String sid, String userSid, String orgPath) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java index a0b52bfed8..cc10cb9c8f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java @@ -152,6 +152,11 @@ public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign { @Override public ResultBean getToDoNum(String userSid) { - return scmVehicleEnterlibraryService.getToDoNum(userSid); + return scmVehicleEnterlibraryService.getToDoNum(userSid,""); + } + + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return scmVehicleEnterlibraryService.getToDoNum(userSid,orgPath); } } 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 481524b632..07da906c3d 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 @@ -546,10 +546,12 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService getToDoNum(String userSid) { + public ResultBean getToDoNum(String userSid,String orgPath) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - int count = baseMapper.getToDoNum(useOrgSid); + if(StringUtils.isBlank(orgPath)){ + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + int count = baseMapper.getToDoNum(orgPath); return rb.success().setData(String.valueOf(count)); } } \ No newline at end of file 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 27f74955bb..ad16416ec6 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 @@ -163,6 +163,11 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign { @Override public ResultBean getToDoNum(String userSid) { - return scmVehicleExamineService.getToDoNum(userSid); + return scmVehicleExamineService.getToDoNum(userSid,""); + } + + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return scmVehicleExamineService.getToDoNum(userSid,orgPath); } } 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 f8495e5bf8..90d8017e87 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 @@ -679,10 +679,12 @@ public class ScmVehicleExamineService extends MybatisBaseService getToDoNum(String userSid) { + public ResultBean getToDoNum(String userSid,String orgPath) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - int count = baseMapper.getToDoNum(useOrgSid); + if(StringUtils.isBlank(orgPath)){ + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + int count = baseMapper.getToDoNum(orgPath); return rb.success().setData(String.valueOf(count)); } } \ No newline at end of file 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 adc96e721b..512055ca0d 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 @@ -218,7 +218,12 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign { @Override public ResultBean getToDoNum(String userSid) { - return scmVehicleGressionService.getToDoNum(userSid); + return scmVehicleGressionService.getToDoNum(userSid,""); + } + + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return scmVehicleGressionService.getToDoNum(userSid,orgPath); } @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 5f9c3a5c79..067182507e 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 @@ -1134,9 +1134,18 @@ public class ScmVehicleGressionService extends MybatisBaseService resultBean = flowableFeign.revokeProcess(flowTaskVo); if (!resultBean.getSuccess()) { - return rb.setMsg("操作失败!"); + return rb.setMsg(resultBean.getMsg()); } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + scmVehicleGression = fetchBySid(query.getBusinessSid()); + String procId = scmVehicleGression.getProcInstId(); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) { + //清除临时车辆表状态 + baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid()); + } return rb.success().setData(resultBean.getData()); } } @@ -1172,6 +1181,8 @@ public class ScmVehicleGressionService extends MybatisBaseService getToDoNum(String userSid) { + public ResultBean getToDoNum(String userSid,String orgPath) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - int count = baseMapper.getToDoNum(useOrgSid, userSid); + if(StringUtils.isBlank(orgPath)){ + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + int count = baseMapper.getToDoNum(orgPath, userSid); return rb.success().setData(String.valueOf(count)); } 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 5b0a10c4f5..9e5e10f179 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 @@ -165,6 +165,11 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign { @Override public ResultBean getToDoNum(String userSid) { - return scmVehicleInventoryService.getToDoNum(userSid); + return scmVehicleInventoryService.getToDoNum(userSid,""); + } + + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return scmVehicleInventoryService.getToDoNum(userSid,orgPath); } } 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 169c8b95e5..667d1dfc75 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 @@ -189,17 +189,20 @@ public class ScmVehicleInventoryService extends MybatisBaseService getCarInventoryList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams(); + String orgPath = params.getOrgPath(); + if(StringUtils.isBlank(orgPath)){ + orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + } AppScmVehicleCarInventoryListPageQuery paramsQuery = pagerQuery.getParams(); - paramsQuery.setUseOrgSid(useOrgSid); + params.setUseOrgSid(orgPath); String date = paramsQuery.getDate(); if (StringUtils.isNotBlank(date)) { String[] s = date.split("至"); paramsQuery.setInventStartDate(s[0]); paramsQuery.setInventEndDate(s[1]); } - QueryWrapper qw = appCarQueryWrapper(pagerQuery.getParams()); - AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams(); + QueryWrapper qw = appCarQueryWrapper(params); IPage iPage = baseMapper.getCarInventoryList(page, qw, params.getNames()); return iPage; } @@ -358,7 +361,11 @@ public class ScmVehicleInventoryService extends MybatisBaseService getToDoNum(String userSid) { + public ResultBean getToDoNum(String userSid,String orgPath) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - int count = baseMapper.getInventoryState(useOrgSid); + if(StringUtils.isBlank(orgPath)){ + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + int count = baseMapper.getInventoryState(orgPath); return rb.success().setData(String.valueOf(count)); } 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 ced7a55597..89f73f6633 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 @@ -128,6 +128,11 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio @Override public ResultBean getToDoNum(String userSid) { - return scmVehiclePatrolinspectionService.getToDoNum(userSid); + return scmVehiclePatrolinspectionService.getToDoNum(userSid,""); + } + + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return scmVehiclePatrolinspectionService.getToDoNum(userSid,orgPath); } } 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 4594275eb4..2d387bfc5a 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 @@ -31,11 +31,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmfile.ScmFileVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDetailsVo; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo; @@ -209,22 +207,26 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService getInspectionList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); - pagerQuery.getParams().setUseOrgSid(useOrgSid); + AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams(); + String orgPath = params.getOrgPath(); + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + } + params.setUseOrgSid(orgPath); QueryWrapper qw = new QueryWrapper<>(); qw.and(wrapper -> wrapper.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001")); qw.eq("svp.isDelete", 0); - if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { - qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid()); + if (StringUtils.isNotBlank(params.getUseOrgSid())) { + qw.eq("svp.createOrgSid", params.getUseOrgSid()); } if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) { qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid()); } - AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams(); + IPage iPage = baseMapper.getInventoryList(page, qw, params.getNames()); List records = iPage.getRecords(); for (AppScmVehicleStayPatrolinspectionPageVo record : records) { - List scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), useOrgSid); + List scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), orgPath); if (scmVehicleStayPatrolinspectionVos.size() > 0) { for (ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo : scmVehicleStayPatrolinspectionVos) { if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate() == null) { @@ -254,9 +256,12 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService getCarInventoryList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); - pagerQuery.getParams().setUseOrgSid(useOrgSid); AppScmVehiclePatrolinspectionPageQuery paramsQuery = pagerQuery.getParams(); + String orgPath = paramsQuery.getOrgPath(); + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + } + paramsQuery.setUseOrgSid(orgPath); String date = paramsQuery.getDate(); if (StringUtils.isNotBlank(date)) { String[] s = date.split("至"); @@ -264,9 +269,9 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(pagerQuery.getParams().getState())) { - if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { - qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid()); + if (StringUtils.isNotBlank(paramsQuery.getState())) { + if (StringUtils.isNotBlank(paramsQuery.getUseOrgSid())) { + qw.eq("svp.createOrgSid", paramsQuery.getUseOrgSid()); } if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) { qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid()); @@ -352,10 +357,12 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService getToDoNum(String userSid) { + public ResultBean getToDoNum(String userSid, String orgPath) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - int count = baseMapper.getToDoNum(useOrgSid); + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + int count = baseMapper.getToDoNum(orgPath); return rb.success().setData(String.valueOf(count)); } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml index ebc5c259d5..c87d218462 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml @@ -5,7 +5,8 @@ - SELECT * FROM scm_vehicle_patrolinspectionsheet + SELECT * + FROM scm_vehicle_patrolinspectionsheet ${ew.sqlSegment} @@ -33,7 +35,8 @@ svps.dutySid as liableSid, svps.location, svps.address, - svps.createBySid as userSid + svps.createBySid as userSid, + svps.useOrgSid orgPath FROM scm_vehicle_patrolinspectionsheet svps WHERE svps.mainSid = #{recordSid} 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 66f8810eb5..1a655bf3ed 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 @@ -27,29 +27,20 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; -import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.scmfile.ScmFile; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*; -import com.yxt.anrui.scm.api.scmvehinventoryreport.AppReportDto; -import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonth; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthFeign; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; -import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService; import com.yxt.anrui.scm.biz.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionService; @@ -57,7 +48,12 @@ import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService; import com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthService; import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService; import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.JPushServer; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.AppMessageDto; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MsgTargetUriEnum; @@ -66,13 +62,6 @@ import com.yxt.messagecenter.api.messagelist.MessageListFeign; import com.yxt.messagecenter.api.messagetype.MessageTypeFeign; import com.yxt.messagecenter.api.messagetype.MessageTypeVo; import org.apache.commons.lang3.StringUtils; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; - - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -82,7 +71,6 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.concurrent.ExecutorService; @@ -257,9 +245,15 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService 0) { return rb.setMsg("请勿重复点击"); @@ -274,11 +268,11 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService 0) { scmVehPatrolinspectionmonthVo = monthVoList.get(0); } else { - scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid()); + scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid(),orgPath); monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); scmVehPatrolinspectionmonthVo = monthVoList.get(0); } - List list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid); + List list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), orgPath); if (list.size() > 0) { String id = list.get(0).getId(); String mainSid = list.get(0).getSid(); @@ -298,18 +292,18 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); @@ -414,14 +414,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService getCarInventoryReport(String sid,String userSid) { - return scmVehInventorymonthService.getCarInventoryReport(sid,userSid); + public ResultBean getCarInventoryReport(String sid, String userSid) { + return scmVehInventorymonthService.getCarInventoryReport(sid, userSid); } } 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 54a09f9304..7a713269b5 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 @@ -26,43 +26,39 @@ package com.yxt.anrui.scm.biz.scmvehinventorymonth; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionDto; -import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageQuery; import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo; import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory; -import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.*; import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListVo; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppLiableListVo; import com.yxt.anrui.scm.biz.scmvehicleinventory.ScmVehicleInventoryService; import com.yxt.anrui.scm.biz.scmvehinventoryreport.ScmVehInventoryreportService; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; /** * Project: aaa(aaa)
@@ -90,6 +86,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService createQueryWrapper(ScmVehInventorymonthQuery query) { @@ -170,16 +168,28 @@ public class ScmVehInventorymonthService extends MybatisBaseService organizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath); + if (organizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = organizationVoResultBean.getData(); + if (sysOrganizationVo != null) { + orgName = sysOrganizationVo.getName(); + } + } + } boolean inventoryState = scmVehicleInventoryService.getInventoryState(userSid); if (inventoryState) { return rb.setMsg("记录存在未确认数据，盘库记录生成失败！"); } - List vehicleCarInventoryListPageVos = scmVehicleInventoryService.getInventoryAll(useOrgSid); + List vehicleCarInventoryListPageVos = scmVehicleInventoryService.getInventoryAll(orgPath); if (vehicleCarInventoryListPageVos != null) { if (vehicleCarInventoryListPageVos.size() > 0) { for (AppScmVehicleCarInventoryListPageVo vehicleCarInventoryListPageVo : vehicleCarInventoryListPageVos) { @@ -210,10 +220,10 @@ public class ScmVehInventorymonthService extends MybatisBaseService getCarInventoryReportList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); AppScmVehInventorymonthQuery paramsQuery = pagerQuery.getParams(); - paramsQuery.setUseOrgSid(useOrgSid); + String orgPath = paramsQuery.getOrgPath(); + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + } + paramsQuery.setUseOrgSid(orgPath); String date = paramsQuery.getDate(); if (StringUtils.isNotBlank(date)) { String[] s = date.split("至"); @@ -281,7 +294,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService getCarInventoryReport(String sid,String userSid) { + public ResultBean getCarInventoryReport(String sid, String userSid) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); AppScmVehInventorymonthInfoVo vo = new AppScmVehInventorymonthInfoVo(); 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 675aec5e00..6552cbae4c 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 @@ -26,7 +26,6 @@ package com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -38,8 +37,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: aaa(aaa)
* File: ScmVehPatrolinspectionmonthFeignFallback.java
@@ -99,7 +96,12 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo @Override public ResultBean getInspectionRecords(String userSid) { - return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid); + return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid,""); + } + + @Override + public ResultBean getInspectionRecords(String userSid, String orgPath) { + return scmVehPatrolinspectionmonthService.getInspectionRecords(userSid,orgPath); } @Override @@ -115,6 +117,11 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo @Override public ResultBean getCarInspectionReport(String sid,String userSid) { - return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid); + return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid,""); + } + + @Override + public ResultBean getCarInspectionReport(String sid, String userSid, String orgPath) { + return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid,orgPath); } } 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 3829231373..20ecc3e63c 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 @@ -31,7 +31,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -41,23 +42,19 @@ import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspecti import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheet; -import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection; -import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo; -import com.yxt.anrui.scm.api.scmvehinventorymonth.*; +import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService; import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService; import com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportService; import com.yxt.common.base.config.component.FileUploadComponent; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -102,6 +99,8 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService createQueryWrapper(ScmVehPatrolinspectionmonthQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -182,15 +181,28 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + if (sysOrganizationVo != null) { + orgName = sysOrganizationVo.getName(); + } + } + + } List vinNoList = new ArrayList<>(); List mainList = new ArrayList<>(); //所有巡检记录 - List patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid); + List patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(orgPath); List list = new ArrayList<>(); if (patrolinspectionVos.size() > 0) { for (ScmVehiclePatrolinspectionVo patrolinspectionVo : patrolinspectionVos) { @@ -224,10 +236,10 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService getCarInspectionReportList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); AppScmVehPatrolinspectionmonthQuery paramsQuery = pagerQuery.getParams(); - paramsQuery.setUseOrgSid(useOrgSid); + String orgPath = paramsQuery.getOrgPath(); + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + } + paramsQuery.setUseOrgSid(orgPath); String date = paramsQuery.getDate(); if (StringUtils.isNotBlank(date)) { String[] s = date.split("至"); @@ -366,9 +381,8 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService getCarInspectionReport(String sid, String userSid) { + public ResultBean getCarInspectionReport(String sid, String userSid, String orgPath) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); AppScmVehPatrolinspectionmonthInfoVo vo = new AppScmVehPatrolinspectionmonthInfoVo(); AppScmVehPatrolinspectionmonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid); if (appScmVehInventorymonthInfoVo != null) { 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 d104680f13..a6dbee8bb2 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 @@ -60,4 +60,9 @@ public interface AppScmBaseInfoFeign { @ResponseBody public ResultBean getToDoNum(@PathVariable("userSid") String userSid); + @ApiOperation("获取供应链各业务模块待办数量") + @GetMapping("/getToDoNum/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getToDoNum(@PathVariable("userSid") String userSid,@PathVariable("orgPath") String orgPath); + } \ 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 a8129e2a12..9e97fa33e7 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 @@ -52,4 +52,9 @@ public class AppScmBaseInfoFeignFallback implements AppScmBaseInfoFeign { public ResultBean getToDoNum(String userSid) { return null; } + + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + 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/inspection/AppInspectionVinQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinQuery.java index 3207df5dc3..339e69c317 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinQuery.java @@ -12,6 +12,8 @@ public class AppInspectionVinQuery implements Query { private String name; @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("分公司sid") - private String useOrgSid; + /*@ApiModelProperty("分公司sid") + private String useOrgSid;*/ + + private String orgPath; } 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 e59451252a..1108d93175 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 @@ -25,8 +25,6 @@ *********************************************************/ package com.yxt.anrui.terminal.api.supplychain.inspection; -import com.yxt.anrui.base.api.basevehicle.InspectionVinQuery; -import com.yxt.anrui.base.api.basevehicle.InspectionVinVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -61,6 +59,11 @@ public interface AppScmVehiclePatrolinspectionFeign { @ResponseBody public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-判断是否生成巡检记录") + @GetMapping("/getInspectionRecords/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid, @PathVariable("orgPath") String orgPath); + @ApiOperation("手机端-获取巡检报告列表") @PostMapping("/getCarInspectionReportList") @ResponseBody @@ -69,7 +72,12 @@ public interface AppScmVehiclePatrolinspectionFeign { @ApiOperation("手机端-获取巡检报告") @GetMapping("/getCarInspectionReport/{sid}/{userSid}") @ResponseBody - public ResultBean getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid); + public ResultBean getCarInspectionReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid); + + @ApiOperation("手机端-获取巡检报告:切换组织机构") + @GetMapping("/getCarInspectionReport/{sid}/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getCarInspectionReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid, @PathVariable("orgPath") String orgPath); @ApiOperation("发送报告") @PostMapping("/sendReport") 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 388b3450ab..b5b29f7eb9 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 @@ -52,6 +52,11 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle return null; } + @Override + public ResultBean getInspectionRecords(String userSid, String orgPath) { + return null; + } + @Override public ResultBean> getCarInspectionReportList(PagerQuery pagerQuery) { return null; @@ -62,6 +67,11 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle return null; } + @Override + public ResultBean getCarInspectionReport(String sid, String userSid, String orgPath) { + return null; + } + @Override public ResultBean sendReport(VehPatrolinspectionreportDto dto) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java index aa6ed3c2b0..8635ba3f2f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java @@ -119,4 +119,7 @@ public class PatrolinspectionDto implements Dto { @ApiModelProperty("存放地点") private String warehouse; + @ApiModelProperty("组织机构sid") + private String orgPath; + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java index 8488f03854..cd0fc84971 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java @@ -57,4 +57,6 @@ public class PatrolinspectionInfoVo implements Vo { @ApiModelProperty("用户sid") private String userName; + private String orgPath; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java index e84110b47d..181a2c9a3e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java @@ -35,7 +35,9 @@ public class PatrolinspectionPageQuery implements Query { @ApiModelProperty("存放地点sid") private String warehouseSid; - @ApiModelProperty("分公司sid") - private String useOrgSid; + /* @ApiModelProperty("分公司sid") + private String useOrgSid;*/ + @ApiModelProperty("组织机构sid") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageQuery.java index 0a2e611ea7..45f637aa38 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageQuery.java @@ -16,7 +16,9 @@ public class StayPatrolinspectionPageQuery implements Query { @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录") private String warehouseSid; - @ApiModelProperty("分公司sid") - private String useOrgSid; + /* @ApiModelProperty("分公司sid") + private String useOrgSid;*/ + @ApiModelProperty("组织机构sid") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionmonthQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionmonthQuery.java index 54c1b698ce..2598aaa6ed 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionmonthQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionmonthQuery.java @@ -24,8 +24,8 @@ public class VehPatrolinspectionmonthQuery implements Query { @ApiModelProperty("巡检状态") private String state; - @ApiModelProperty("分公司sid") - private String useOrgSid; + /* @ApiModelProperty("分公司sid") + private String useOrgSid;*/ @ApiModelProperty("盘库开始日期") @JsonProperty("InventStartDate") @@ -35,4 +35,7 @@ public class VehPatrolinspectionmonthQuery implements Query { @JsonProperty("InventEndDate") private String InventEndDate; + @ApiModelProperty("组织机构sid") + private String orgPath; + } 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 40af9e69b6..836a367024 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 @@ -59,6 +59,11 @@ public interface AppScmVehicleInventoryFeign { @ResponseBody public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-判断是否生成盘库记录:切换机构") + @GetMapping("/getInventoryRecords/{userSid}/{orgPath}") + @ResponseBody + public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid, @PathVariable("orgPath") String orgPath); + @ApiOperation("手机端-获取待盘库列表") @PostMapping("/getInventoryList") @ResponseBody 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 6d4584c781..ace18ec53e 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 @@ -51,6 +51,11 @@ public class AppScmVehicleInventoryFeignFallback implements AppScmVehicleInvento return null; } + @Override + public ResultBean getInventoryRecords(String userSid, String orgPath) { + return null; + } + @Override public ResultBean> getInventoryList(PagerQuery pagerQuery) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java index dc9cbd5147..a388a6719a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java @@ -7,6 +7,7 @@ import lombok.Data; @Data public class CarInventoryListPageQuery implements Query { + private static final long serialVersionUID = -8642474315791484452L; @ApiModelProperty("用户sid") private String userSid; @@ -25,7 +26,9 @@ public class CarInventoryListPageQuery implements Query { @ApiModelProperty("月度盘库sid") private String reportSid; - @ApiModelProperty("使用组织分公司sid") - private String useOrgSid; +// @ApiModelProperty("使用组织分公司sid") +// private String useOrgSid; + @ApiModelProperty("组织机构sid") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java index 8b155b21ab..748c849f3f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java @@ -83,4 +83,7 @@ public class StayInventoryDto implements Dto { @ApiModelProperty("定位经纬度") private String addressCode; + @ApiModelProperty("组织机构sid") + private String orgPath; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java index 42f031f9c2..429e75fb62 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.terminal.api.supplychain.inventory; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -100,5 +101,7 @@ public class StayInventoryInfoVo implements Vo { @ApiModelProperty("定位经纬度") private String addressCode; + @JsonProperty("orgPath") + private String createOrgSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthQuery.java index fb88a31aec..538e9b0c38 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthQuery.java @@ -21,8 +21,8 @@ public class VehInventorymonthQuery implements Query { private String reportSid; @ApiModelProperty("盘库结果") private String state; - @ApiModelProperty("使用组织名称") - private String useOrgSid; + /* @ApiModelProperty("使用组织名称") + private String useOrgSid;*/ @ApiModelProperty("盘库开始日期") @JsonProperty("InventStartDate") @@ -31,4 +31,6 @@ public class VehInventorymonthQuery implements Query { @ApiModelProperty("盘库结束日期") @JsonProperty("InventEndDate") private String InventEndDate; + @ApiModelProperty("组织机构sid") + private String orgPath; } 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 5635b6e607..79b2207694 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 @@ -27,12 +27,7 @@ package com.yxt.anrui.terminal.biz.supplychain.baseInfo; import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoFeign; import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo; -import com.yxt.anrui.terminal.api.supplychain.carInspected.AppScmVehinspectItemFeign; -import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemDto; -import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemInfoVo; -import com.yxt.anrui.terminal.biz.supplychain.carInspected.AppScmVehinspectItemService; import com.yxt.common.core.result.ResultBean; -import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -59,6 +54,11 @@ public class AppScmBaseInfoRest implements AppScmBaseInfoFeign { @Override public ResultBean getToDoNum(String userSid) { - return appScmBaseInfoService.getToDoNum(userSid); + return appScmBaseInfoService.getToDoNum(userSid,""); + } + + @Override + public ResultBean getToDoNum(String userSid, String orgPath) { + return appScmBaseInfoService.getToDoNum(userSid,orgPath); } } 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 00523a94e4..17d9e6a56d 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 @@ -3,12 +3,10 @@ package com.yxt.anrui.terminal.biz.supplychain.baseInfo; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign; import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign; import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign; -import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory; import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign; -import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryFeign; -import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionFeign; import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,14 +26,27 @@ public class AppScmBaseInfoService { ScmVehiclePatrolinspectionFeign scmVehiclePatrolinspectionFeign; - public ResultBean getToDoNum(String userSid) { + public ResultBean getToDoNum(String userSid, String orgPath) { ResultBean rb = ResultBean.fireFail(); AppScmBaseInfoVo appScmBaseInfoVo = new AppScmBaseInfoVo(); - String inspectedCarNum = scmVehicleExamineFeign.getToDoNum(userSid).getData(); - String storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(userSid).getData(); - String moveCarNum = scmVehicleGressionFeign.getToDoNum(userSid).getData(); - String inventoryCarNum = scmVehicleInventoryFeign.getToDoNum(userSid).getData(); - String inspectinoCarNum = scmVehiclePatrolinspectionFeign.getToDoNum(userSid).getData(); + String inspectedCarNum = ""; + String storageCarNum = ""; + String moveCarNum = ""; + String inventoryCarNum = ""; + String inspectinoCarNum = ""; + if(StringUtils.isBlank(orgPath)){ + inspectedCarNum = scmVehicleExamineFeign.getToDoNum(userSid).getData(); + storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(userSid).getData(); + moveCarNum = scmVehicleGressionFeign.getToDoNum(userSid).getData(); + inventoryCarNum = scmVehicleInventoryFeign.getToDoNum(userSid).getData(); + inspectinoCarNum = scmVehiclePatrolinspectionFeign.getToDoNum(userSid).getData(); + }else{ + inspectedCarNum = scmVehicleExamineFeign.getToDoNum(userSid,orgPath).getData(); + storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(userSid,orgPath).getData(); + moveCarNum = scmVehicleGressionFeign.getToDoNum(userSid,orgPath).getData(); + inventoryCarNum = scmVehicleInventoryFeign.getToDoNum(userSid,orgPath).getData(); + inspectinoCarNum = scmVehiclePatrolinspectionFeign.getToDoNum(userSid,orgPath).getData(); + } appScmBaseInfoVo.setInspectedCarNum(inspectedCarNum); appScmBaseInfoVo.setStorageCarNum(storageCarNum); appScmBaseInfoVo.setMoveCarNum(moveCarNum); 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 1285089ff4..77a1601bc2 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 @@ -61,6 +61,11 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins return appScmVehiclePatrolinspectionService.getInspectionRecords(userSid); } + @Override + public ResultBean getInspectionRecords(String userSid, String orgPath) { + return appScmVehiclePatrolinspectionService.getInspectionRecords(userSid,orgPath); + } + @Override public ResultBean> getCarInspectionReportList(PagerQuery pagerQuery) { return appScmVehiclePatrolinspectionService.getCarInspectionReportList(pagerQuery); @@ -71,6 +76,11 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins return appScmVehiclePatrolinspectionService.getCarInspectionReport(sid,userSid); } + @Override + public ResultBean getCarInspectionReport(String sid, String userSid, String orgPath) { + return appScmVehiclePatrolinspectionService.getCarInspectionReport(sid,userSid,orgPath); + } + @Override public ResultBean sendReport(VehPatrolinspectionreportDto dto) { return appScmVehiclePatrolinspectionService.sendReport(dto); 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 549b8cad4a..c6d70f310e 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 @@ -88,6 +88,11 @@ public class AppScmVehiclePatrolinspectionService { return resultBean; } + public ResultBean getInspectionRecords(String userSid, String orgPath) { + ResultBean resultBean = scmVehPatrolinspectionmonthFeign.getInspectionRecords(userSid, orgPath); + return resultBean; + } + /** * 手机端-获取巡检列表 * @@ -166,6 +171,17 @@ public class AppScmVehiclePatrolinspectionService { return rb.success().setData(vo); } + public ResultBean getCarInspectionReport(String sid, String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + VehPatrolinspectionmonthInfoVo vo = new VehPatrolinspectionmonthInfoVo(); + ResultBean resultBean = scmVehPatrolinspectionmonthFeign.getCarInspectionReport(sid, userSid, orgPath); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + BeanUtil.copyProperties(resultBean.getData(), vo); + return rb.success().setData(vo); + } + public ResultBean> getInspectionVinList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); 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 7bf784eabc..a87594df44 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 @@ -25,19 +25,14 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.supplychain.inventory; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.scm.api.scmvehicleinventory.*; import com.yxt.anrui.terminal.api.supplychain.inventory.*; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; /** @@ -67,6 +62,11 @@ public class AppScmVehicleInventoryRest implements AppScmVehicleInventoryFeign { return appScmVehicleInventoryService.getInventoryRecords(userSid); } + @Override + public ResultBean getInventoryRecords(String userSid, String orgPath) { + return appScmVehicleInventoryService.getInventoryRecords(userSid, orgPath); + } + @Override public ResultBean> getInventoryList(PagerQuery pagerQuery) { return appScmVehicleInventoryService.getInventoryList(pagerQuery); @@ -108,8 +108,8 @@ public class AppScmVehicleInventoryRest implements AppScmVehicleInventoryFeign { } @Override - public ResultBean getCarInventoryReport(String sid,String userSid) { - return appScmVehicleInventoryService.getCarInventoryReport(sid,userSid); + public ResultBean getCarInventoryReport(String sid, String userSid) { + return appScmVehicleInventoryService.getCarInventoryReport(sid, userSid); } @Override 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 8d6577ac34..992f7b4a70 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 @@ -27,14 +27,11 @@ package com.yxt.anrui.terminal.biz.supplychain.inventory; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.scm.api.scmvehicleinventory.*; -import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageQuery; -import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageVo; import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryFeign; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthQuery; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthFeign; -import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto; import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDto; import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportFeign; import com.yxt.anrui.terminal.api.supplychain.inventory.*; @@ -45,8 +42,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - /** * Project: anrui_scm(anrui_scm)
* File: ScmVehicleInventoryService.java
@@ -86,6 +81,11 @@ public class AppScmVehicleInventoryService { return resultBean; } + public ResultBean getInventoryRecords(String userSid,String orgPath) { + ResultBean resultBean = scmVehInventorymonthFeign.getInventoryRecords(userSid,orgPath); + return resultBean; + } + /** * 手机端-获取待盘库列表 *