diff --git a/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java b/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java index 8ee5d652..ddb2579a 100644 --- a/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java +++ b/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java @@ -4,6 +4,7 @@ import com.spring.common.utils.PageUtils; import com.spring.common.utils.R; import com.spring.modules.customer.vo.CustomerInformationVo; import com.spring.modules.oss.entity.SysOssEntity; +import com.spring.modules.project.data.PlmProjectInfoData; import com.spring.modules.project.data.PlmProjectPartData; import com.spring.modules.quotation.entity.QuotationInformationEntity; import com.spring.modules.quotation.service.QuotationInformationService; @@ -215,4 +216,17 @@ public class QuotationInformationController { Integer flag = quotationInformationService.checkQuotationStatus(data); return R.ok().put("flag", flag); } + + /** + * @description: 获取项目信息 + * @author: fengyuan_yang + * @date: 2023/10/7 14:37 + * @param: [data] + * @return: com.spring.common.utils.R + **/ + @PostMapping("/getProjectInformation") + public R getProjectInformation(@RequestBody PlmProjectInfoData data) { + List resultList = quotationInformationService.getProjectInformation(data); + return R.ok().put("rows", resultList); + } } 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 58b42ea4..ef8a8884 100644 --- a/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java +++ b/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.spring.modules.customer.entity.CustomerAddressEntity; import com.spring.modules.oss.entity.SysOssEntity; +import com.spring.modules.project.data.PlmProjectInfoData; import com.spring.modules.project.data.PlmProjectPartData; import com.spring.modules.quotation.entity.QuotationInformationEntity; import com.spring.modules.quotation.vo.QuotationInformationVo; @@ -22,4 +23,6 @@ public interface QuotationInformationMapper extends BaseMapper getProjectPartList(PlmProjectPartData data); + + List getProjectInformation(PlmProjectInfoData data); } diff --git a/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java b/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java index 158bde69..a3498a71 100644 --- a/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java +++ b/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java @@ -3,6 +3,7 @@ package com.spring.modules.quotation.service; import com.baomidou.mybatisplus.extension.service.IService; import com.spring.common.utils.PageUtils; import com.spring.modules.oss.entity.SysOssEntity; +import com.spring.modules.project.data.PlmProjectInfoData; import com.spring.modules.project.data.PlmProjectPartData; import com.spring.modules.quotation.entity.QuotationInformationEntity; import com.spring.modules.quotation.vo.QuotationInformationVo; @@ -43,4 +44,6 @@ public interface QuotationInformationService extends IService getProjectPartList(PlmProjectPartData data); Integer checkQuotationStatus(QuotationInformationVo data); + + List getProjectInformation(PlmProjectInfoData data); } diff --git a/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java index b86bef76..f5ed8845 100644 --- a/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java @@ -13,6 +13,7 @@ import com.spring.modules.customer.entity.CustomerInformationEntity; import com.spring.modules.oss.dao.SysOssDao; import com.spring.modules.oss.entity.SysOssEntity; import com.spring.modules.oss.service.SysOssService; +import com.spring.modules.project.data.PlmProjectInfoData; import com.spring.modules.project.data.PlmProjectPartData; import com.spring.modules.quotation.entity.QuotationInformationEntity; import com.spring.modules.quotation.mapper.QuotationInformationMapper; @@ -81,6 +82,7 @@ public class QuotationInformationServiceImpl extends ServiceImpl map = new HashMap<>(); + HashMap map1 = new HashMap<>(); + HashMap map2 = new HashMap<>(); for (QuotationInformationEntity entity : data.getInformationList()) { // 条件 - map.put("site", entity.getSite()); - map.put("quotation_no", entity.getQuotationNo()); + map1.put("site", entity.getSite()); + map1.put("quotation_no", entity.getQuotationNo()); + map2.put("order_ref1", entity.getSite()); + map2.put("order_ref2", entity.getQuotationNo()); // 删除报价信息数据 - quotationInformationMapper.deleteByMap(map); + quotationInformationMapper.deleteByMap(map1); + // 删除报价相关文件 + sysOssDao.deleteByMap(map2); } } @@ -228,13 +235,14 @@ public class QuotationInformationServiceImpl extends ServiceImpl !a.getQuotationResultStatus().equals(data.getCurrentStatus())); - if (b) { - return 2; - } - // 判断选中的报价单的报价进度是否一致 + // 判断选中的报价单的报价进度是否一致(如果全部相等:count应该等于1) long count = data.getInformationList().stream().map(QuotationInformationEntity::getQuotationResultStatus).distinct().count(); - //判断(如果全部相等:count应该等于1) - if (count != 1) { - return 3; + if (b || count != 1) { + return 2; } return 1; } - /** - * @description: 获取 update 条件构造器 + * @description: 获取项目信息 * @author: fengyuan_yang - * @date: 2023/9/25 15:32 + * @date: 2023/10/7 14:38 * @param: [data] - * @return: com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper + * @return: java.util.List **/ - public UpdateWrapper getUpdateWrapper (QuotationInformationEntity data) { - UpdateWrapper updateWrapper = new UpdateWrapper(); - updateWrapper.eq("site", data.getSite()); - updateWrapper.eq("quotation_no", data.getQuotationNo()); - return updateWrapper; + @Override + public List getProjectInformation(PlmProjectInfoData data) { + List list = quotationInformationMapper.getProjectInformation(data); + return list; } + protected SysUserEntity getUser() { return (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); } diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml index 3cee05f6..db7650ba 100644 --- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml +++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml @@ -145,4 +145,38 @@ + + +