From ad20f12b1b01eb1dfccd0e8a93214427cb803776 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 20 Oct 2022 08:37:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/BaseInterNalPurchaseCompleteDto.java | 3 +- .../flow/BaseModelModPriceCompleteDto.java | 3 +- .../BusinessVariablesDto.java | 2 + .../api/basevehicle/BaseVehicleFeign.java | 8 ++- .../basevehicle/BaseVehicleFeignFallback.java | 7 +- .../flow/BaseActualSalesCompleteDto.java | 6 +- .../flow/BusVehicleApplyCompleteDto.java | 4 +- .../BaseInternalPurchaseService.java | 5 ++ .../BaseModelModpriceService.java | 5 ++ .../BaseOutsourcingApplicationService.java | 7 +- .../base/biz/basevehicle/BaseVehicleRest.java | 10 ++- .../biz/basevehicle/BaseVehicleService.java | 10 +-- .../BaseVehicleActualSalesService.java | 5 ++ .../BusVehicleApplyService.java | 5 ++ .../crmcustomertemp/CrmCustomerTempMapper.xml | 2 +- .../sqloperationsymbol/BusinessVariables.java | 3 + .../anrui/flowable/biz/flow/FlowableRest.java | 12 ++-- .../anrui/portal/api/sysuser/UserQuery.java | 3 + .../biz/sysstafforg/SysStaffOrgMapper.java | 2 +- .../portal/biz/sysuser/SysUserService.java | 25 ++++--- .../AppScmVehicleEnterlibraryPageQuery.java | 3 + .../AppScmVehicleExamineInfoVo.java | 2 + .../AppScmVehicleExaminePageQuery.java | 3 + .../flowable/ScmCarTransferCompleteDto.java | 5 +- .../ScmVehicleReturnFlowQuery.java | 2 + .../api/scmwarehouse/ScmWarehouseFeign.java | 6 +- .../ScmWarehouseFeignFallback.java | 5 ++ .../ScmVehicleEnterlibraryService.java | 7 +- .../ScmVehicleExamineMapper.java | 2 +- .../ScmVehicleExamineMapper.xml | 4 +- .../ScmVehicleExamineService.java | 13 ++-- .../ScmVehicleGressionService.java | 42 ++++++++---- .../ScmVehicleReturnService.java | 5 ++ .../biz/scmwarehouse/ScmWarehouseRest.java | 15 ++-- .../biz/scmwarehouse/ScmWarehouseService.java | 12 ++-- .../virtualOrders/AppBusMainDepositFeign.java | 5 +- .../AppBusMainDepositFeignFallback.java | 2 +- .../flowable/CompanyShuntingDto.java | 3 +- .../flowable/ExternalPurchaseDto.java | 2 + .../modelAdjust/ModelModPriceCompleteDto.java | 5 +- .../VehicleReturnFlowQuery.java | 18 ++--- .../AppEnterlibraryPageQuery.java | 3 +- .../scmvehicleexamine/AppExamineInfoVo.java | 2 + .../AppExaminePageQuery.java | 2 + .../flowable/CompleteGressionDto.java | 2 + .../flowable/UnsoldBuyoutDto.java | 2 + .../flowable/VehicleApplyDto.java | 2 + .../virtualOrders/AppBusMainDepositRest.java | 7 +- .../AppBusMainDepositService.java | 14 ++-- .../CompanyShuntingService.java | 68 +++++++++++-------- .../ExternalPurchaseService.java | 34 ++++++---- .../AppBaseModelModpriceService.java | 34 ++++++---- .../AppScmVehicleReturnService.java | 33 +++++---- .../AppScmVehicleGressionService.java | 32 +++++---- .../unsoldBuyout/UnsoldBuyoutService.java | 32 +++++---- .../vehicleApply/VehicleApplyService.java | 32 +++++---- 56 files changed, 372 insertions(+), 215 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java index 2e9574c9db..f3fde3dc4a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java @@ -19,7 +19,6 @@ public class BaseInterNalPurchaseCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "参数错误：orgSidPath") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") @@ -38,4 +37,6 @@ public class BaseInterNalPurchaseCompleteDto implements Dto { private String businessSid; @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？") private Map formVariables; + + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java index e58586b37e..c440876385 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java @@ -19,7 +19,6 @@ public class BaseModelModPriceCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") -// @NotBlank(message = "参数错误：orgSidPath") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") @@ -38,4 +37,6 @@ public class BaseModelModPriceCompleteDto implements Dto { private String businessSid; @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？") private Map formVariables; + + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java index f8e4716b18..01209a703d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java @@ -55,4 +55,6 @@ public class BusinessVariablesDto { * 业务参数，按需传递 */ private Map formVariables; + + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 620f602d67..e978e3a290 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 @@ -329,7 +329,7 @@ public interface BaseVehicleFeign { @ApiOperation("付款申请选择车辆分页列表") @PostMapping("/selectPayVehicleList") - ResultBean> selectPayVehicleList(@RequestBody PagerQuery pagerQuery); + ResultBean> selectPayVehicleList(@RequestBody PagerQuery pagerQuery); @ApiOperation("入库根据车架号更改车辆台账数据") @PostMapping("/updateVehicleEnterlibraryByVin") @@ -399,6 +399,10 @@ public interface BaseVehicleFeign { @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}") public ResultBean> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid); + @ApiOperation("根据仓库sid 获取车架号") + @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}/{orgPath}") + public ResultBean> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid, @PathVariable(value = "orgPath", required = false) String orgPath); + /** * 存放地点变更选择车辆 * @@ -429,7 +433,7 @@ public interface BaseVehicleFeign { @ApiOperation("PC-巡检获取车价号") @PostMapping("/getPCInspectionVinList") @ResponseBody - public ResultBean>> getPCInspectionVinList(@RequestBody InspectionVinQuery query); + public ResultBean>> getPCInspectionVinList(@RequestBody InspectionVinQuery query); @ApiOperation("销售订单补录选择车架号") @PostMapping("/saleOrderVin") 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 495db4e840..6e32a8c8fd 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 @@ -214,7 +214,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean> selectAppList(String modelSid, String configSid,String orgSid) { + public ResultBean> selectAppList(String modelSid, String configSid, String orgSid) { return null; } @@ -303,6 +303,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) { + return null; + } + @Override public ResultBean> getPcVinByWarehouseSid(PagerQuery pagerQuery) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java index 517b39c3f9..aad3896ad8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java @@ -20,7 +20,6 @@ public class BaseActualSalesCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "参数错误：orgSidPath") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") @@ -32,11 +31,10 @@ public class BaseActualSalesCompleteDto implements Dto { @NotBlank(message = "参数错误：instanceId") private String instanceId; @ApiModelProperty(value = "意见") -// @NotBlank(message = "参数错误：comment") private String comment; @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误：businessSid") private String businessSid; -// @ApiModelProperty(value = "分支字段及业务字段") -// private Map formVariables; + + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java index b0830454ae..801d36904a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java @@ -36,6 +36,6 @@ public class BusVehicleApplyCompleteDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误：businessSid") private String businessSid; -// @ApiModelProperty(value = "分支字段及业务字段") -// private Map formVariables; + + private String orgPath; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 64c6b6acce..366e88bcf4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -433,6 +433,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService formVariables = bv.getFormVariables(); if (formVariables != null) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index 5749fd3671..1223056b07 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -314,6 +314,11 @@ public class BaseModelModpriceService extends MybatisBaseService baseModelModpriceModelVos = baseModelModpriceModelService.fetchByMainSid(bv.getBusinessSid()); if (bv.getTaskId().equals(baseModelModprice.getTaskId())) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index a9892e4c8c..461a0a6390 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -86,7 +86,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -518,6 +517,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService> pagerList(@RequestBody PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -442,7 +443,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { sf.setFStockId("ARZTCK"); } else { ResultBean scmWarehouseVoResultBean = scmWarehouseFeign.fetchBySid(baseVehicleDto.getLocation()); - if(scmWarehouseVoResultBean.getSuccess()){ + if (scmWarehouseVoResultBean.getSuccess()) { ScmWarehouseVo data = scmWarehouseVoResultBean.getData(); sf.setFStockId(data.getGressionCode()); } @@ -1058,7 +1059,12 @@ public class BaseVehicleRest implements BaseVehicleFeign { @Override public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid) { - return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid); + return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid, ""); + } + + @Override + public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) { + return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid, orgPath); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 7e36ee3957..7f0e4ef5af 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 @@ -2004,13 +2004,15 @@ public class BaseVehicleService extends MybatisBaseService> getVinByWarehouseSid(String warehouseSid, String userSid) { + public ResultBean> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); List carSidList = baseVehicleTempstateService.selectAll("001"); - ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - if (StringUtils.isNotBlank(resultBean.getData())) { - qw.eq("bv.createOrgSid", resultBean.getData()); + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + if (StringUtils.isNotBlank(orgPath)) { + qw.eq("bv.createOrgSid", orgPath); } if (carSidList.size() > 0) { qw.notIn("bv.sid", carSidList); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index dbe26f2f94..a16947f67b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -435,6 +435,11 @@ public class BaseVehicleActualSalesService extends MybatisBaseService variables = new HashMap<>(); 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 813a0f96cf..a5026adcf2 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 @@ -48,7 +48,7 @@ AND cct.name LIKE concat('%', #{name}, '%') - GROUP BY cct.id DESC + order BY cct.id DESC