配置价格维护页面详情查询接口、配置价格维护页面保存接口

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;
-	}
 }

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<PagerVo<BaseVehmodelConfigVo>> listPage(@RequestBody PagerQuery<BaseVehmodelConfigQuery> pq);
 
-    @ApiOperation("根据条件查询所有数据列表")
-    @PostMapping("/listAll")
-    public ResultBean<List<BaseVehmodelConfigVo>> listAll(@RequestBody BaseVehmodelConfigQuery query);
-
-    @ApiOperation("所有数据列表")
-    @GetMapping("/list")
-    public ResultBean<List<BaseVehmodelConfigVo>> 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<BaseVehmodelConfigVo> fetch(@PathVariable("id") String id);
-
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<BaseVehmodelConfigVo> fetchBySid(@PathVariable("sid") String sid);

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<List<BaseVehmodelConfigVo>> listAll(BaseVehmodelConfigQuery query) {
-        ResultBean rb = ResultBean.fireFail();
-        return rb.setMsg("接口anrui-base/basevehmodelconfig/listAll无法访问");
-    }
-
-    @Override
-    public ResultBean<List<BaseVehmodelConfigVo>> 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<BaseVehmodelConfigVo> fetch(String id) {
-        ResultBean rb = ResultBean.fireFail();
-        return rb.setMsg("接口anrui-base/basevehmodelconfig/fetch无法访问");
-    }
-
     @Override
     public ResultBean<BaseVehmodelConfigVo> fetchBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();

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 = "是否常用车型")

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<BaseVehmodelConfig>
     ExiCarConfigDetailVo getModelAndConfigDetails(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
     BaseVehmodelConfigVo checkSave(@Param("modelSid") String modelSid, @Param("configurationItemsSid") String configurationItemsSid);
+
+    BaseVehmodelConfig getBySid(String sid);
 }

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
-        <where>${ew.sqlSegment}</where>
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
         SELECT * FROM base_vehmodel_config
-        <where>${ew.sqlSegment}</where>
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="getAppCommonlyUsedModelsByPageList"
@@ -129,10 +133,19 @@
     </select>
 
     <select id="checkSave" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
-        SELECT
-                *
-        FROM
-                base_vehmodel_config
-        WHERE modelSid = #{modelSid} and configurationItemsSid = #{configurationItemsSid}
+        SELECT *
+        FROM base_vehmodel_config
+        WHERE modelSid = #{modelSid}
+          and configurationItemsSid = #{configurationItemsSid}
+    </select>
+
+    <select id="getBySid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig">
+        SELECT bvm.`modelName`,
+               bmc.`configName`,
+               bvc.`manufactorSettlementPrice`,
+               bvc.`guidedPrice`
+        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`
     </select>
 </mapper>

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<List<BaseVehmodelConfigVo>> listAll(@RequestBody BaseVehmodelConfigQuery query) {
-        ResultBean rb = ResultBean.fireFail();
-        List<BaseVehmodelConfigVo> list = baseVehmodelConfigService.listAllVo(query);
-        return rb.success().setData(list);
-    }
-
-    @Override
-    @ApiOperation("所有数据列表")
-    @GetMapping("/list")
-    public ResultBean<List<BaseVehmodelConfigVo>> list() {
-        ResultBean rb = ResultBean.fireFail();
-        List<BaseVehmodelConfigVo> 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<BaseVehmodelConfigVo> 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<BaseVehmodelConfigVo> fetchBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
-        BaseVehmodelConfig vo = baseVehmodelConfigService.fetchBySid(sid);
+        BaseVehmodelConfig vo = baseVehmodelConfigService.getBySid(sid);
         return rb.success().setData(vo);
     }
 

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<BaseVehmodelCo
         deleteBySid(sid);
         return rb.success().setMsg("解除成功");
     }
+
+    public BaseVehmodelConfig getBySid(String sid) {
+        return baseMapper.getBySid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -249,6 +249,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
 	 * @param map
 	 */
 	private void saveSysFormLink(Map<String, String> map) {
+		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"));
@@ -257,5 +260,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
 			sysFormLinkDto.setFormType(SysFormLinkTypeEnum.VEHICLE_APPLY.getCode());
 			sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
 			sysFormLinkFeign.save(sysFormLinkDto);
+		} else { // 更新
+			Map<String, Object> 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);
+		}
 	}
 }