diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java index e7c04a6d62..739bf2f9cf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java @@ -30,7 +30,9 @@ 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.math.BigDecimal; /** @@ -47,102 +49,25 @@ import java.math.BigDecimal; * @since 1.0 */ @ApiModel(value = "车型与简述配置关联表 数据传输对象", description = "车型与简述配置关联表 数据传输对象") +@Data public class BaseVehmodelConfigDto implements Dto { - + @ApiModelProperty("车型与简述配置关联sid") + private String sid; // 车型与简述配置关联sid @ApiModelProperty("车型sid") private String modelSid; // 车型sid - @ApiModelProperty("简述配置sid") private String configurationItemsSid; // 简述配置sid - @ApiModelProperty("厂家结算价") + @NotBlank(message = "厂家结算价不能为空") private BigDecimal manufactorSettlementPrice; // 厂家结算价 - @ApiModelProperty("销售参考价") private BigDecimal salesReferencePrice; // 销售参考价 - + @ApiModelProperty("销售指导价") + @NotBlank(message = "销售指导价不能为空") + private String guidedPrice; // 销售指导价 @ApiModelProperty("价格有效期") private String priceValidity; // 价格有效期 - @ApiModelProperty(value = "是否常用车型") private Integer isCommonModel; - - /** - * @return 车型sid - */ - public String getModelSid(){ - return modelSid; - } - - /** - * @param modelSid 车型sid to set - */ - public void setModelSid(String modelSid){ - this.modelSid = modelSid; - } - - /** - * @return 简述配置sid - */ - public String getConfigurationItemsSid(){ - return configurationItemsSid; - } - - /** - * @param configurationItemsSid 简述配置sid to set - */ - public void setConfigurationItemsSid(String configurationItemsSid){ - this.configurationItemsSid = configurationItemsSid; - } - - /** - * @return 厂家结算价 - */ - public BigDecimal getManufactorSettlementPrice() { - return manufactorSettlementPrice; - } - - /** - * @param manufactorSettlementPrice 厂家结算价 to set - */ - public void setManufactorSettlementPrice(BigDecimal manufactorSettlementPrice) { - this.manufactorSettlementPrice = manufactorSettlementPrice; - } - - /** - * @return 销售参考价 - */ - public BigDecimal getSalesReferencePrice() { - return salesReferencePrice; - } - - /** - * @param salesReferencePrice 销售参考价 to set - */ - public void setSalesReferencePrice(BigDecimal salesReferencePrice) { - this.salesReferencePrice = salesReferencePrice; - } - - /** - * @return 价格有效期 - */ - public String getPriceValidity(){ - return priceValidity; - } - - /** - * @param priceValidity 价格有效期 to set - */ - public void setPriceValidity(String priceValidity){ - this.priceValidity = priceValidity; - } - - public Integer getIsCommonModel() { - return isCommonModel; - } - - public void setIsCommonModel(Integer isCommonModel) { - this.isCommonModel = isCommonModel; - } } \ No newline at end of file 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 edfc46c917..bde8a09ec2 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 @@ -60,38 +60,18 @@ public interface BaseVehmodelConfigFeign { @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("根据条件查询所有数据列表") - @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody BaseVehmodelConfigQuery query); - - @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list(); - @ApiOperation("车型与常用配置建立关联关系") @PostMapping("/save") public ResultBean save(@RequestBody BaseVehmodelConfigDto dto); @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BaseVehmodelConfigDto dto, @PathVariable("sid") String sid); - - @ApiOperation("删除记录") - @GetMapping("/del/{ids}") - public ResultBean del(@PathVariable("ids") String ids); + @PostMapping("/update") + public ResultBean update(@RequestBody BaseVehmodelConfigDto dto); @ApiOperation("车型与常用配置解除关联关系") @DeleteMapping("/checkRelieve") public ResultBean checkRelieve(@RequestParam("modelSid") String modelSid, @RequestParam("configurationItemsSid") String configurationItemsSid); - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("获取一条记录") - @GetMapping("/fetch/{id}") - public ResultBean fetch(@PathVariable("id") String id); - @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); 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 ad37762178..b582fcf451 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 @@ -55,49 +55,21 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign return rb.setMsg("接口anrui-base/basevehmodelconfig/listPage无法访问"); } - @Override - public ResultBean> listAll(BaseVehmodelConfigQuery query) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-base/basevehmodelconfig/listAll无法访问"); - } - - @Override - public ResultBean> list() { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-base/basevehmodelconfig/list无法访问"); - } - @Override public ResultBean save(BaseVehmodelConfigDto dto) { return ResultBean.fireFail().setMsg("接口anrui-base/basevehmodelconfig/save无法访问"); } @Override - public ResultBean update(BaseVehmodelConfigDto dto, String sid) { + public ResultBean update(BaseVehmodelConfigDto dto) { return ResultBean.fireFail().setMsg("接口anrui-base/basevehmodelconfig/update无法访问"); } - @Override - public ResultBean del(String ids) { - 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无法访问"); - } - - @Override - public ResultBean fetch(String id) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-base/basevehmodelconfig/fetch无法访问"); - } - @Override public ResultBean fetchBySid(String sid) { ResultBean rb = ResultBean.fireFail(); 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 49c030644a..b3636d9de0 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 @@ -65,6 +65,8 @@ public class BaseVehmodelConfigVo implements Vo { private String manufactorSettlementPrice; // 厂家结算价 @ApiModelProperty("销售参考价") private String salesReferencePrice; // 销售参考价 + @ApiModelProperty("销售指导价") + private String guidedPrice; // 销售指导价 @ApiModelProperty("价格有效期") private String priceValidity; // 价格有效期 @ApiModelProperty(value = "是否常用车型") 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 b88dfaa629..5bf857e138 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 @@ -108,4 +108,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper ExiCarConfigDetailVo getModelAndConfigDetails(@Param("modelSid") String modelSid, @Param("configSid") String configSid); BaseVehmodelConfigVo checkSave(@Param("modelSid") String modelSid, @Param("configurationItemsSid") String configurationItemsSid); + + BaseVehmodelConfig getBySid(String 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.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 5d5de18775..ff7e510ead 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 @@ -14,12 +14,16 @@ ON bvc.modelSid = bvm.sid LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid - ${ew.sqlSegment} + + ${ew.sqlSegment} + SELECT count(*) FROM base_vehmodel_config bvc - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid WHERE bvc.modelSid = #{modelSid} @@ -122,17 +126,26 @@ bmc.configuringBao, bmc.otherConfig FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` + LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` 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 0b124a48e9..7e3e9fe687 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 @@ -71,24 +71,6 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign { return rb.success().setData(pv); } - @Override - @ApiOperation("根据条件查询所有数据列表") - @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody BaseVehmodelConfigQuery query) { - ResultBean rb = ResultBean.fireFail(); - List list = baseVehmodelConfigService.listAllVo(query); - return rb.success().setData(list); - } - - @Override - @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list() { - ResultBean rb = ResultBean.fireFail(); - List list = baseVehmodelConfigService.listVo(); - return rb.success().setData(list); - } - @Override @ApiOperation("车型与常用配置建立关联关系") @PostMapping("/save") @@ -98,19 +80,10 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign { @Override @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BaseVehmodelConfigDto dto, @PathVariable("sid") String sid) { + @PostMapping("/update") + public ResultBean update(@RequestBody BaseVehmodelConfigDto dto) { ResultBean rb = ResultBean.fireFail(); - baseVehmodelConfigService.updateBySid(dto.toMap(), sid); - return rb.success(); - } - - @Override - @ApiOperation("删除记录") - @GetMapping("/del/{ids}") - public ResultBean del(@PathVariable("ids") String ids) { - ResultBean rb = ResultBean.fireFail(); - baseVehmodelConfigService.delByIds(ids); + baseVehmodelConfigService.updateBySid(dto.toMap(), dto.getSid()); return rb.success(); } @@ -119,30 +92,12 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign { return baseVehmodelConfigService.checkRelieve(modelSid,configurationItemsSid); } - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids) { - ResultBean rb = ResultBean.fireFail(); - baseVehmodelConfigService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("获取一条记录") - @GetMapping("/fetch/{id}") - public ResultBean fetch(@PathVariable("id") String id) { - ResultBean rb = ResultBean.fireFail(); - BaseVehmodelConfigVo vo = baseVehmodelConfigService.fetchByIdVo(id); - return rb.success().setData(vo); - } - @Override @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid) { ResultBean rb = ResultBean.fireFail(); - BaseVehmodelConfig vo = baseVehmodelConfigService.fetchBySid(sid); + BaseVehmodelConfig vo = baseVehmodelConfigService.getBySid(sid); return rb.success().setData(vo); } 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 4657c7e981..75933dcfc6 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 @@ -362,4 +362,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService map) { - SysFormLinkDto sysFormLinkDto = new SysFormLinkDto(); - sysFormLinkDto.setBusinessSid(map.get("sid")); - sysFormLinkDto.setProcInsId(map.get("procInsId")); - sysFormLinkDto.setTaskDefKey(map.get("taskDefKey")); - sysFormLinkDto.setNodeState(map.get("nodeState")); - sysFormLinkDto.setFormType(SysFormLinkTypeEnum.VEHICLE_APPLY.getCode()); - sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode())); - sysFormLinkFeign.save(sysFormLinkDto); + String sid = map.get("sid"); + ResultBean resultBean = sysFormLinkFeign.selectByBusinessSid(sid); + if (!resultBean.getSuccess()) { // 新增 + SysFormLinkDto sysFormLinkDto = new SysFormLinkDto(); + sysFormLinkDto.setBusinessSid(map.get("sid")); + sysFormLinkDto.setProcInsId(map.get("procInsId")); + sysFormLinkDto.setTaskDefKey(map.get("taskDefKey")); + sysFormLinkDto.setNodeState(map.get("nodeState")); + sysFormLinkDto.setFormType(SysFormLinkTypeEnum.VEHICLE_APPLY.getCode()); + sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode())); + sysFormLinkFeign.save(sysFormLinkDto); + } else { // 更新 + Map updateMap = new HashMap<>(); + updateMap.put("businessSid", sid); + updateMap.put("nodeState", map.get("nodeState")); + updateMap.put("taskDefKey", map.get("taskDefKey")); + updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode()); + sysFormLinkFeign.updateFiled(updateMap); + } } } \ No newline at end of file