From bebedd0d68ed26a3695fc9c4cd7c8ce1e8a79495 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 25 Jul 2022 17:45:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseModelModpriceService.java | 21 ++++++++++++++++++- .../BaseShuntingInvoicingApplyService.java | 3 +++ .../biz/basevehicle/BaseVehicleService.java | 2 ++ .../BaseVehmodelConfigMapper.java | 9 ++++---- .../scmapplyinbound/ScmApplyInboundVo.java | 6 ++++++ .../ScmVehicleStayInventoryMapper.xml | 2 ++ .../ScmVehicleStayInventoryService.java | 1 + 7 files changed, 39 insertions(+), 5 deletions(-) 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 46626d69a7..b2125f1f5f 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 @@ -38,10 +38,13 @@ import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel; import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto; import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; import com.yxt.anrui.base.api.busvehicleapply.flow.SubmitBusVehicleApplyDto; import com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService; +import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigMapper; +import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -62,6 +65,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -94,6 +98,8 @@ public class BaseModelModpriceService extends MybatisBaseService listPageVo(PagerQuery pq) { BaseModelModpriceQuery query = pq.getParams(); @@ -268,6 +274,7 @@ public class BaseModelModpriceService extends MybatisBaseService baseModelModpriceModelVos = baseModelModpriceModelService.fetchByMainSid(bv.getBusinessSid()); if (bv.getTaskId().equals(baseModelModprice.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -276,7 +283,19 @@ public class BaseModelModpriceService extends MybatisBaseService IPage selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); BaseVehmodelConfig selectSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid); + + @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice} where sid = #{sid}") + void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice,@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index d220035aca..25e27885aa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -71,6 +72,11 @@ public class ScmApplyInboundVo implements Vo { @ApiModelProperty("二次运费") private BigDecimal secondaryFreight; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("车辆台数") + private String num; + @ApiModelProperty("政策1") private String policyOne; @ApiModelProperty("可享受金额1") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml index e272c6e8a9..f79e827c16 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml @@ -21,6 +21,8 @@ scm_vehicle_stay_inventory svsi LEFT JOIN scm_vehicle_inventory svi ON svsi.`mainSid` = svi.`mainSid` + LEFT JOIN anrui_base.`base_vehicle` bv + ON bv.`vinNo` = svsi.mainSid ${ew.sqlSegment} GROUP BY svsi.`mainSid` diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java index 8e6346d109..50efbf42bd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java @@ -92,6 +92,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);