diff --git a/src/main/java/com/spring/modules/quotation/controller/PriceCheckPropertiesController.java b/src/main/java/com/spring/modules/quotation/controller/PriceCheckPropertiesController.java index 56089f03..6fcf272e 100644 --- a/src/main/java/com/spring/modules/quotation/controller/PriceCheckPropertiesController.java +++ b/src/main/java/com/spring/modules/quotation/controller/PriceCheckPropertiesController.java @@ -20,20 +20,38 @@ public class PriceCheckPropertiesController { private PriceCheckPropertiesService priceCheckPropertiesService; @PostMapping("/list") - public R searchTestPropertiesList(@RequestBody PriceCheckProperties testProperties){ - List list = priceCheckPropertiesService.searchPriceCheckPropertiesList(testProperties); + public R searchPriceCheckPropertiesList(@RequestBody PriceCheckProperties Properties){ + List list = priceCheckPropertiesService.searchPriceCheckPropertiesList(Properties); return R.ok().put("rows",list); } @PostMapping("/update") - public R updateTestPropertiesList(@RequestBody List propertiesList){ + public R updatePriceCheckPropertiesList(@RequestBody List propertiesList){ priceCheckPropertiesService.updatePriceCheckPropertiesList(propertiesList); return R.ok().put("msg","操作成功"); } @PostMapping("/search") - public R searchTestPropertiesListFlushed(@RequestBody PriceCheckProperties properties){ + public R searchPriceCheckPropertiesListFlushed(@RequestBody PriceCheckProperties properties){ priceCheckPropertiesService.searchPriceCheckPropertiesListFlushed(properties); return R.ok().put("msg","操作成功"); } + + @PostMapping("/item/list") + public R searchPriceCheckPropertiesItemList(@RequestBody PriceCheckPropertiesVo Properties){ + List list = priceCheckPropertiesService.searchPriceCheckPropertiesItemList(Properties); + return R.ok().put("rows",list); + } + + @PostMapping("/item/save") + public R savePriceCheckPropertiesItem(@RequestBody List list){ + priceCheckPropertiesService.savePriceCheckPropertiesItem(list); + return R.ok().put("msg","操作成功"); + } + + @PostMapping("/item/remove") + public R removePriceCheckPropertiesItem(@RequestBody List list){ + priceCheckPropertiesService.removePriceCheckPropertiesItem(list); + return R.ok().put("msg","操作成功"); + } } diff --git a/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java b/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java index b60577fa..c22e11fb 100644 --- a/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java +++ b/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java @@ -44,9 +44,17 @@ public interface QuotationInformationMapper extends BaseMapper searchPriceCheckPropertiesVo(@Param("site") String site, @Param("quotationNo") String quotationNo); + List searchPriceCheckPropertiesVo(@Param("site") String site, + @Param("quotationNo") String quotationNo, + @Param("codeNo")String codeNo); List searchPriceCheckProperties(@Param("site") String site, @Param("type")String type, @Param("code")String code); + + List searchPriceCheckPropertiesItemList(@Param("site") String site, + @Param("type") String quotationCodeType, + @Param("itemNo")String itemNo, + @Param("itemDesc")String itemDesc, + @Param("list")List list); } \ No newline at end of file diff --git a/src/main/java/com/spring/modules/quotation/service/PriceCheckPropertiesService.java b/src/main/java/com/spring/modules/quotation/service/PriceCheckPropertiesService.java index dffa8338..1865ca6a 100644 --- a/src/main/java/com/spring/modules/quotation/service/PriceCheckPropertiesService.java +++ b/src/main/java/com/spring/modules/quotation/service/PriceCheckPropertiesService.java @@ -15,4 +15,10 @@ public interface PriceCheckPropertiesService extends IService propertiesList); void searchPriceCheckPropertiesListFlushed(PriceCheckProperties properties); + + List searchPriceCheckPropertiesItemList(PriceCheckPropertiesVo testProperties); + + void savePriceCheckPropertiesItem(List list); + + void removePriceCheckPropertiesItem(List list); } diff --git a/src/main/java/com/spring/modules/quotation/service/impl/PriceCheckPropertiesServiceImpl.java b/src/main/java/com/spring/modules/quotation/service/impl/PriceCheckPropertiesServiceImpl.java index a0e215b2..7a9f1f20 100644 --- a/src/main/java/com/spring/modules/quotation/service/impl/PriceCheckPropertiesServiceImpl.java +++ b/src/main/java/com/spring/modules/quotation/service/impl/PriceCheckPropertiesServiceImpl.java @@ -3,6 +3,7 @@ package com.spring.modules.quotation.service.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.spring.common.utils.Constant; +import com.spring.modules.base.entity.PlmPropertiesItemAvailable; import com.spring.modules.quotation.entity.PriceCheckProperties; import com.spring.modules.quotation.mapper.PriceCheckPropertiesMapper; import com.spring.modules.quotation.mapper.QuotationInformationMapper; @@ -27,7 +28,7 @@ public class PriceCheckPropertiesServiceImpl extends ServiceImpl searchPriceCheckPropertiesList(PriceCheckProperties properties) { - return quotationInformationMapper.searchPriceCheckPropertiesVo(properties.getSite(),properties.getQuotationNo()); + return quotationInformationMapper.searchPriceCheckPropertiesVo(properties.getSite(),properties.getQuotationNo(),Constant.QUOTATION_CODE_NO); } @Override @@ -58,4 +59,31 @@ public class PriceCheckPropertiesServiceImpl extends ServiceImpl searchPriceCheckPropertiesItemList(PriceCheckPropertiesVo testProperties) { + return quotationInformationMapper.searchPriceCheckPropertiesItemList(testProperties.getSite(), + Constant.QUOTATION_CODE_TYPE,testProperties.getItemNo(),testProperties.getItemDesc(),testProperties.getList().stream().map(PlmPropertiesItemAvailable::getItemNo).collect(Collectors.toList())); + } + + @Override + @Transactional + public void savePriceCheckPropertiesItem(List list) { + if (list == null || list.isEmpty()){ + throw new RuntimeException("至少选择一条询价属性"); + } + saveBatch(list); + } + + @Override + @Transactional + public void removePriceCheckPropertiesItem(List list) { + if (list == null || list.isEmpty()){ + throw new RuntimeException("至少选择一条询价属性"); + } + lambdaUpdate().eq(PriceCheckProperties::getQuotationNo,list.get(0).getQuotationNo()) + .eq(PriceCheckProperties::getSite,list.get(0).getSite()) + .in(PriceCheckProperties::getItemNo,list.stream().map(PriceCheckProperties::getItemNo).collect(Collectors.toList())) + .remove(); + } } diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml index 86fecf22..cb24e54f 100644 --- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml +++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml @@ -458,7 +458,7 @@ a.num_value, a.quotation_no FROM plm_price_check_properties a - left join plm_properties_model_detail b on a.site = b.site and a.function_type = b.function_type and b.code_no = 'T1' and a.item_no = b.properties_item_no + left join plm_properties_model_detail b on a.site = b.site and a.function_type = b.function_type and b.code_no = #{codeNo} and a.item_no = b.properties_item_no where quotation_no = #{quotationNo} and a.site = #{site} order by b.order_id @@ -480,4 +480,33 @@ where a.function_type = #{type} and a.code_no = #{code} and a.site = #{site} order by a.order_id + +