From 03254ebb0a93d4d49b1308b907a155a57fba6db3 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 6 Apr 2022 16:25:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E6=8F=90=E4=BA=A4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E3=80=81=E8=BD=A6=E5=9E=8B=E4=B8=8E?= =?UTF-8?q?=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE=E5=BB=BA=E7=AB=8B=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB=E3=80=81=E8=BD=A6=E5=9E=8B=E4=B8=8E?= =?UTF-8?q?=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE=E8=A7=A3=E9=99=A4=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB=E3=80=81=E8=BD=A6=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E8=BD=A6=E5=9E=8B=E7=9A=84=E8=AF=A6=E6=83=85=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleModelDetailsVo.java | 6 - .../basevehiclemodel/BaseVehicleModelDto.java | 23 ++-- .../BaseVehicleModelFeign.java | 20 +-- .../BaseVehicleModelFeignFallback.java | 9 +- .../BaseVehicleModelQuery.java | 34 +++-- .../BaseVehicleModelSelectVo.java | 7 ++ .../BaseVehmodelConfigFeign.java | 6 +- .../BaseVehmodelConfigFeignFallback.java | 5 + .../BaseVehmodelConfigVo.java | 2 + .../busvehicleapply/BusVehicleApplyDto.java | 2 - .../busvehicleapply/BusVehicleApplyVo.java | 4 +- .../BaseVehicleModelRest.java | 25 +--- .../BaseVehicleModelService.java | 118 +++++++++++++++--- .../BaseVehicleModelAppendixMapper.java | 6 + .../BaseVehicleModelAppendixService.java | 8 ++ .../BaseVehmodelConfigMapper.java | 2 + .../BaseVehmodelConfigMapper.xml | 8 ++ .../BaseVehmodelConfigRest.java | 11 +- .../BaseVehmodelConfigService.java | 25 ++++ .../busvehicleapply/BusVehicleApplyRest.java | 5 +- .../BusVehicleApplyService.java | 13 +- .../anrui/base/biz/flow/FlowableService.java | 16 ++- 22 files changed, 251 insertions(+), 104 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java index b9ab3e540d..dcb14e255c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java @@ -120,10 +120,4 @@ public class BaseVehicleModelDetailsVo implements Vo { @ApiModelProperty("简述配置信息") private BaseModelConfigVo baseModelConfigVo; - - @ApiModelProperty("车型上装信息") - private BaseModelSzconfigVo baseModelSzconfigVo; - - @ApiModelProperty("车型挂车信息") - private BaseTrailerVo baseTrailerVo; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java index c09197fea9..5af66a9fc8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java @@ -1,12 +1,14 @@ package com.yxt.anrui.base.api.basevehiclemodel; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.List; /** * Project: anrui-base(安瑞基础信息模块)
@@ -27,8 +29,10 @@ public class BaseVehicleModelDto implements Dto { private static final long serialVersionUID = 5561227612462825877L; -// @ApiModelProperty(value = "部门sid", required = true) -// private String deptSid; + // @ApiModelProperty(value = "部门sid", required = true) + // private String deptSid; + @ApiModelProperty(value = "车型sid") + private String sid; @ApiModelProperty(value = "厂商(陕汽必须的字段)", required = true) @NotBlank(message = "厂商不能为空") @@ -42,7 +46,7 @@ public class BaseVehicleModelDto implements Dto { @NotBlank(message = "车辆类型不能为空") private String vehicleType; - @ApiModelProperty(value = "车辆类型value值",required = true) + @ApiModelProperty(value = "车辆类型value值", required = true) private String vehicleTypeValue; // @ApiModelProperty("车型代号(1、平板/载货3、自卸4、牵引5、专用车/特种车)") @@ -69,24 +73,24 @@ public class BaseVehicleModelDto implements Dto { @ApiModelProperty(value = "排放标准value值") private String emissionStandardValue; - @ApiModelProperty(value = "驱动形式",required = true) + @ApiModelProperty(value = "驱动形式", required = true) private String driveForm; @ApiModelProperty(value = "驱动形式value值") private String driveFormValue; - @ApiModelProperty(value = "马力",required = true) + @ApiModelProperty(value = "马力", required = true) private String power; @ApiModelProperty(value = "马力value值") private String powerValue; - @ApiModelProperty(value = "变速箱",required = true) + @ApiModelProperty(value = "变速箱", required = true) private String gearboxType; @ApiModelProperty(value = "变速箱value值") private String gearboxTypeValue; - @ApiModelProperty(value = "燃料种类",required = true) + @ApiModelProperty(value = "燃料种类", required = true) private String fuelType; @ApiModelProperty(value = "燃料种类value值") private String fuelTypeValue; - @ApiModelProperty(value = "车辆版本",required = true) + @ApiModelProperty(value = "车辆版本", required = true) private String vehicleVersion; @ApiModelProperty("车辆版本value值") @@ -151,4 +155,7 @@ public class BaseVehicleModelDto implements Dto { @ApiModelProperty("是否可以删除（1是，0否）") private Integer isDel; + + @ApiModelProperty("车型附件") + private List baseVehicleModelAppendixDtos; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java index 22f587a8e3..d62bb9a487 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java @@ -54,26 +54,14 @@ public interface BaseVehicleModelFeign { public ResultBean> downList(); /** - * 车型信息新增保存 + * 车型信息新增修改保存 * * @param dto * @return */ - @ApiOperation("新增保存") - @PostMapping("/save") - public ResultBean save(@Valid @RequestBody BaseVehicleModelDto dto); - - /** - * 修改保存 - * - * @param dto 传输对象 - * @param sid 车型sid - * @return - */ - @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - @ApiImplicitParam(name = "sid", value = "车型sid") - public ResultBean update(@Valid @RequestBody BaseVehicleModelDto dto, @PathVariable("sid") String sid); + @ApiOperation("新增修改保存") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@Valid @RequestBody BaseVehicleModelDto dto); /** * 删除、批量删除 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java index 21bc822dff..d79cd9179f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java @@ -36,13 +36,8 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign { } @Override - public ResultBean save(BaseVehicleModelDto dto) { - return ResultBean.fireFail().setMsg("接口anrui-base/basevehiclemodel/save无法访问"); - } - - @Override - public ResultBean update(BaseVehicleModelDto dto, String sid) { - return ResultBean.fireFail().setMsg("接口anrui-base/basevehiclemodel/update无法访问"); + public ResultBean saveOrUpdate(BaseVehicleModelDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-base/basevehiclemodel/saveOrUpdate无法访问"); } @Override diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java index 8515522c92..e28673ce19 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java @@ -23,16 +23,30 @@ import lombok.Data; @Data public class BaseVehicleModelQuery implements Query { - - @ApiModelProperty(value = "车型名称") - private String modelName; - - @ApiModelProperty(value = "车型型号") - private String carModel; - - @ApiModelProperty(value = "品牌") - private String brandName; - @ApiModelProperty(value = "品牌sid") private String carBrand; + @ApiModelProperty(value = "功能key") + private String vehicleType; + @ApiModelProperty(value = "系列key") + private String productLine; + @ApiModelProperty(value = "驱动key") + private String driveForm; + @ApiModelProperty(value = "马力key") + private String power; + @ApiModelProperty(value = "车辆版本key值") + private String vehicleVersion; + @ApiModelProperty(value = "燃料种类key值") + private String fuelType; + @ApiModelProperty(value = "车型编码") + private String vehicleTypeCode; + @ApiModelProperty(value = "变速箱key值") + private String gearboxType; + @ApiModelProperty(value = "排放标准key值") + private String emissionStandard; + @ApiModelProperty(value = "发动机型号key值") + private String engineType; + @ApiModelProperty(value = "细分市场key值") + private String marketSegments; + @ApiModelProperty(value = "规格型号") + private String specifications; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelSelectVo.java index 1f201770bb..71d0a8e3a4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelSelectVo.java @@ -1,9 +1,13 @@ package com.yxt.anrui.base.api.basevehiclemodel; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author dimengzhe * @date 2021/9/29 8:53 @@ -115,4 +119,7 @@ public class BaseVehicleModelSelectVo implements Vo { @ApiModelProperty("是否可以删除（1是，0否）") private Integer isDel; + + @ApiModelProperty("是否可以删除（1是，0否）") + private List baseVehicleModelAppendixVos; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java index 733a6d9766..edfc46c917 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java @@ -68,7 +68,7 @@ public interface BaseVehmodelConfigFeign { @GetMapping("/list") public ResultBean> list(); - @ApiOperation("新增保存") + @ApiOperation("车型与常用配置建立关联关系") @PostMapping("/save") public ResultBean save(@RequestBody BaseVehmodelConfigDto dto); @@ -80,6 +80,10 @@ public interface BaseVehmodelConfigFeign { @GetMapping("/del/{ids}") public ResultBean del(@PathVariable("ids") String ids); + @ApiOperation("车型与常用配置解除关联关系") + @DeleteMapping("/checkRelieve") + public ResultBean checkRelieve(@RequestParam("modelSid") String modelSid, @RequestParam("configurationItemsSid") String configurationItemsSid); + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java index 527f973ce1..ad37762178 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java @@ -82,6 +82,11 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign return ResultBean.fireFail().setMsg("接口anrui-base/basevehmodelconfig/del无法访问"); } + @Override + public ResultBean checkRelieve(String modelSid, String configurationItemsSid) { + return null; + } + @Override public ResultBean delBySids(String[] sids) { return ResultBean.fireFail().setMsg("接口anrui-base/basevehmodelconfig/delBySids无法访问"); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java index 5a88ce3fe6..49c030644a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java @@ -51,6 +51,8 @@ import java.math.BigDecimal; @Data public class BaseVehmodelConfigVo implements Vo { + @ApiModelProperty("车型与简述配置关联sid") + private String sid; // 车型与简述配置关联sid @ApiModelProperty("车型sid") private String modelSid; // 车型sid @ApiModelProperty("车型名称") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index e75ad9c246..01396be127 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -31,8 +31,6 @@ public class BusVehicleApplyDto implements Dto { private String sid; // 排产申请单sid @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("用户sid") - private String userSid; // 用户sid @ApiModelProperty("申请人sid") private String createBySid; @ApiModelProperty("申请日期") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java index a877a76644..44a0cb68c4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java @@ -41,7 +41,7 @@ public class BusVehicleApplyVo implements Vo { @ApiModelProperty("创建组织sid") private String createByDeptSid; @ApiModelProperty("当前订金金额") - private String currentDepositAmount; + private String currentAmount; @ApiModelProperty("本次需使用金额") private String amountToBeUsedThisTime; @ApiModelProperty("本次申请金额") @@ -51,7 +51,7 @@ public class BusVehicleApplyVo implements Vo { @ApiModelProperty("sid") private String sid; // sid @ApiModelProperty("节点状态") - private String nodeState; // sid + private String nodeState; // nodeState @ApiModelProperty("车辆排产申请详情") private List busVehicleApplyDetailVoList; // 车辆排产申请详情 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java index 9e09ce9128..930b7e7ea4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java @@ -77,29 +77,8 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { } @Override - public ResultBean save(BaseVehicleModelDto dto) { - ResultBean rb = ResultBean.fireFail(); - BaseVehicleModel entity = new BaseVehicleModel(); - dto.fillEntity(entity); - boolean isSave = baseVehicleModelService.save(entity); - if (!isSave) { - return rb.setMsg("车型信息保存失败"); - } - return rb.success().setMsg("保存成功"); - } - - @Override - public ResultBean update(BaseVehicleModelDto dto, String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(sid); - if (baseVehicleModel == null) { - return rb.setMsg("该车型信息不存在"); - } - int i = baseVehicleModelService.updateBySid(dto.toMap(), sid); - if (i == 0) { - return rb.setMsg("修改失败"); - } - return rb.success().setMsg("修改成功"); + public ResultBean saveOrUpdate(BaseVehicleModelDto dto) { + return baseVehicleModelService.saveOrUpdateAll(dto); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index b0d4ae1703..06aed69ca8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java @@ -8,8 +8,13 @@ import com.yxt.anrui.base.api.basemodelconfig.PcChooseBaseModelConfigVo; import com.yxt.anrui.base.api.basemodelszconfig.BaseModelSzconfigVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerVo; import com.yxt.anrui.base.api.basevehiclemodel.*; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixQuery; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; +import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService; import com.yxt.anrui.portal.api.sysorganization.SysOrgVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -17,6 +22,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -53,6 +59,10 @@ public class BaseVehicleModelService extends MybatisBaseService qw = new QueryWrapper<>(); if (pagerQuery != null) { qw.eq("bvm.isDelete", "0"); - if (StringUtils.isNotBlank(pagerQuery.getModelName())) {//车型名称 - qw.like("bvm.modelName", pagerQuery.getModelName()); - } - /* if (StringUtils.isNotBlank(pagerQuery.getCarModel())) {//车型型号 - qw.like("bvm.carModel", pagerQuery.getCarModel()); - }*/ - if (StringUtils.isNotBlank(pagerQuery.getBrandName())) {//品牌 - qw.like("bvm.brandName", pagerQuery.getBrandName()); - } if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌sid qw.eq("bvm.carBrand", pagerQuery.getCarBrand()); } - + if (StringUtils.isNotBlank(pagerQuery.getVehicleType())) {//功能key + qw.eq("bvm.vehicleType", pagerQuery.getVehicleType()); + } + if (StringUtils.isNotBlank(pagerQuery.getProductLine())) {//系列key + qw.eq("bvm.productLine", pagerQuery.getProductLine()); + } + if (StringUtils.isNotBlank(pagerQuery.getDriveForm())) {//驱动key + qw.eq("bvm.driveForm", pagerQuery.getDriveForm()); + } + if (StringUtils.isNotBlank(pagerQuery.getPower())) {//马力key + qw.eq("bvm.power", pagerQuery.getPower()); + } + if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) {//车辆版本key值 + qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion()); + } + if (StringUtils.isNotBlank(pagerQuery.getFuelType())) {//燃料种类key值 + qw.eq("bvm.fuelType", pagerQuery.getFuelType()); + } + if (StringUtils.isNotBlank(pagerQuery.getVehicleTypeCode())) {//车型编码 + qw.eq("bvm.vehicleTypeCode", pagerQuery.getVehicleTypeCode()); + } + if (StringUtils.isNotBlank(pagerQuery.getGearboxType())) {//变速箱key值 + qw.eq("bvm.gearboxType", pagerQuery.getGearboxType()); + } + if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) {//排放标准key值 + qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard()); + } + if (StringUtils.isNotBlank(pagerQuery.getEngineType())) {//发动机型号key值 + qw.eq("bvm.engineType", pagerQuery.getEngineType()); + } + if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) {//细分市场key值 + qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments()); + } + if (StringUtils.isNotBlank(pagerQuery.getSpecifications())) {//规格型号 + qw.eq("bvm.specifications", pagerQuery.getSpecifications()); + } } return qw; } @@ -121,10 +157,6 @@ public class BaseVehicleModelService extends MybatisBaseService baseVehicleModelAppendixVos = baseVehicleModelAppendixService.fetchByVehModelSid(sid); + for (BaseVehicleModelAppendixVo baseVehicleModelAppendixVo : baseVehicleModelAppendixVos) { + String filePath = baseVehicleModelAppendixVo.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + baseVehicleModelAppendixVo.setFilePath(filePath); + } + baseVehicleModelSelectVo.setBaseVehicleModelAppendixVos(baseVehicleModelAppendixVos); return baseVehicleModelSelectVo; } @@ -353,4 +393,54 @@ public class BaseVehicleModelService extends MybatisBaseService qw = createBuildQueryWrapper(query.getParams()); return baseMapper.modelPageList(page, qw); } + + public ResultBean saveOrUpdateAll(BaseVehicleModelDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + if (StringUtils.isBlank(sid)){ + BaseVehicleModel entity = new BaseVehicleModel(); + String sid1 = entity.getSid(); + BeanUtil.copyProperties(dto,entity); + entity.setSid(sid1); + boolean isSave = save(entity); + if (!isSave) { + return rb.setMsg("车型信息保存失败"); + } + List baseVehicleModelAppendixDtos = dto.getBaseVehicleModelAppendixDtos(); + for (BaseVehicleModelAppendixDto baseVehicleModelAppendixDto : baseVehicleModelAppendixDtos) { + String filePath = baseVehicleModelAppendixDto.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + baseVehicleModelAppendixDto.setModelSid(entity.getSid()); + baseVehicleModelAppendixDto.setFilePath(filePath); + BaseVehicleModelAppendix baseVehicleModelAppendix = new BaseVehicleModelAppendix(); + baseVehicleModelAppendixDto.fillEntity(baseVehicleModelAppendix); + baseVehicleModelAppendixService.save(baseVehicleModelAppendix); + } + return rb.success().setMsg("保存成功"); + } + BaseVehicleModel baseVehicleModel = fetchBySid(sid); + if (baseVehicleModel == null) { + return rb.setMsg("该车型信息不存在"); + } + int i = updateBySid(dto.toMap(), sid); + baseVehicleModelAppendixService.deleteByVehModelSid(sid); + List baseVehicleModelAppendixDtos = dto.getBaseVehicleModelAppendixDtos(); + for (BaseVehicleModelAppendixDto baseVehicleModelAppendixDto : baseVehicleModelAppendixDtos) { + String filePath = baseVehicleModelAppendixDto.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + baseVehicleModelAppendixDto.setModelSid(sid); + baseVehicleModelAppendixDto.setFilePath(filePath); + BaseVehicleModelAppendix baseVehicleModelAppendix = new BaseVehicleModelAppendix(); + baseVehicleModelAppendixDto.fillEntity(baseVehicleModelAppendix); + baseVehicleModelAppendixService.save(baseVehicleModelAppendix); + } + if (i == 0) { + return rb.setMsg("修改失败"); + } + return rb.success().setMsg("修改成功"); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixMapper.java index ea4c4a6041..433b2c173b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixMapper.java @@ -37,4 +37,10 @@ public interface BaseVehicleModelAppendixMapper extends BaseMapper selectListVo(); + + @Select("delete from base_vehicle_model_appendix where modelSid = #{sid}") + void deleteByVehModelSid(String sid); + + @Select("select * from base_vehicle_model_appendix where modelSid = #{sid}") + List fetchByVehModelSid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixService.java index 6b49f755c5..6173ec085c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixService.java @@ -89,4 +89,12 @@ public class BaseVehicleModelAppendixService extends MybatisBaseService fetchByVehModelSid(String sid) { + return baseMapper.fetchByVehModelSid(sid); + } + + public void deleteByVehModelSid(String sid) { + baseMapper.deleteByVehModelSid(sid); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java index fb1460d341..b88dfaa629 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java @@ -106,4 +106,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper * @return */ ExiCarConfigDetailVo getModelAndConfigDetails(@Param("modelSid") String modelSid, @Param("configSid") String configSid); + + BaseVehmodelConfigVo checkSave(@Param("modelSid") String modelSid, @Param("configurationItemsSid") String configurationItemsSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 5692d3c98b..5d5de18775 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -127,4 +127,12 @@ WHERE bvm.sid = #{modelSid} AND bmc.sid = #{configSid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java index a214b50d05..0b124a48e9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java @@ -90,12 +90,10 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign { } @Override - @ApiOperation("新增保存") + @ApiOperation("车型与常用配置建立关联关系") @PostMapping("/save") public ResultBean save(@RequestBody BaseVehmodelConfigDto dto) { - ResultBean rb = ResultBean.fireFail(); - baseVehmodelConfigService.saveOrUpdateDto(dto); - return rb.success(); + return baseVehmodelConfigService.checkSave(dto); } @Override @@ -116,6 +114,11 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign { return rb.success(); } + @Override + public ResultBean checkRelieve(String modelSid, String configurationItemsSid) { + return baseVehmodelConfigService.checkRelieve(modelSid,configurationItemsSid); + } + @Override @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 2b285f76aa..4657c7e981 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -337,4 +337,29 @@ public class BaseVehmodelConfigService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/flow/FlowableService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/flow/FlowableService.java index a13f92980f..034cc7e5f0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/flow/FlowableService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/flow/FlowableService.java @@ -4,13 +4,18 @@ import com.yxt.anrui.base.api.flow.Flowable; import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTask; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -34,7 +39,9 @@ public class FlowableService extends MybatisBaseService variables) { + public ResultBean businessStart(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, + @ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, + @ApiParam(value = "变量集合,json对象") @RequestBody Map variables) { variables.put("procDefId",procDefId); variables.put("userSid",userSid); BusinessVariables bv= BusinessVariables.builder().build(); @@ -46,9 +53,14 @@ public class FlowableService extends MybatisBaseService list = flowTaskFeign.getLatestTasks(procId).getData(); + String nodeState = list.get(0).getName_(); + String task_def_key_ = list.get(0).getTask_def_key_(); Map map = new HashMap<>(); + map.put("sid", variables.get("businessSid").toString()); map.put("nodeState", nodeState); + map.put("procInsId", rb.getData().getProcInsId()); + map.put("taskDefKey", task_def_key_); return new ResultBean().success().setData(map); } }