From 442afb30279968d664db9f364ee0e8f504ef4171 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Mon, 18 Mar 2024 11:03:59 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E3=80=81?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SectionMaterialController.java | 12 ++++++ .../entity/SectionMaterialVO.java | 23 ++++++++++++ .../service/ISectionMaterialService.java | 2 + .../impl/SectionMaterialServiceImpl.java | 37 +++++++++++++------ 4 files changed, 63 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/controller/SectionMaterialController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/controller/SectionMaterialController.java index 68acde3..65ecb47 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/controller/SectionMaterialController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/controller/SectionMaterialController.java @@ -3,6 +3,7 @@ package com.chinaunicom.mall.ebtp.project.sectionmaterial.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageResponse; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.sectionmaterial.entity.SectionMaterial; import com.chinaunicom.mall.ebtp.project.sectionmaterial.entity.SectionMaterialVO; @@ -90,4 +91,15 @@ public class SectionMaterialController{ query.in(SectionMaterial::getSectionId,sectionIds); return BaseResponse.success(sectionMaterialService.list(query)); } + @ApiOperation("根据标段查询物资信息") + @PostMapping("/list") + public BaseResponse> list(@ApiParam(value = "对象数据", required = true) @RequestBody SectionMaterialVO sectionMaterial){ + return BaseResponse.success(sectionMaterialService.getList(sectionMaterial)); + } + + @ApiOperation("根据标段查询物资信息") + @PostMapping("/findPage") + public BasePageResponse findPage(@ApiParam(value = "对象数据", required = true) @RequestBody SectionMaterialVO sectionMaterial){ + return BasePageResponse.success(sectionMaterialService.findPage(sectionMaterial)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/entity/SectionMaterialVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/entity/SectionMaterialVO.java index 0f18150..47e6e8b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/entity/SectionMaterialVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/entity/SectionMaterialVO.java @@ -2,10 +2,14 @@ package com.chinaunicom.mall.ebtp.project.sectionmaterial.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** * 项目物资信息VO类 SectionMaterial @@ -18,4 +22,23 @@ import java.io.Serializable; @ApiModel("项目物资信息VO类") @TableName(autoResultMap = true) public class SectionMaterialVO extends SectionMaterial implements Serializable { + private List sectionIds; + + @ApiModelProperty("当前页") + @NotNull + @Min(0) + private Integer pageNo; + + @ApiModelProperty("每页显示条数") + @NotNull + @Min(0) + private Integer pageSize; + + public Integer getPageNo() { + return null == pageNo ? 0 : pageNo; + } + + public Integer getPageSize() { + return null == pageSize ? 10 : pageSize; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/ISectionMaterialService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/ISectionMaterialService.java index cca3cd3..6a125d6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/ISectionMaterialService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/ISectionMaterialService.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.project.sectionmaterial.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; import com.chinaunicom.mall.ebtp.project.sectionmaterial.entity.SectionMaterial; import com.chinaunicom.mall.ebtp.project.sectionmaterial.entity.SectionMaterialVO; @@ -37,4 +38,5 @@ public interface ISectionMaterialService extends IBaseService{ */ List getList(SectionMaterialVO sectionMaterialVO); + IPage findPage(SectionMaterialVO sectionMaterialVO); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/impl/SectionMaterialServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/impl/SectionMaterialServiceImpl.java index 24fa5b6..66441a7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/impl/SectionMaterialServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/impl/SectionMaterialServiceImpl.java @@ -1,7 +1,13 @@ package com.chinaunicom.mall.ebtp.project.sectionmaterial.service.impl; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.project.sectionmaterial.dao.SectionMaterialMapper; import com.chinaunicom.mall.ebtp.project.sectionmaterial.entity.SectionMaterial; @@ -10,6 +16,7 @@ import com.chinaunicom.mall.ebtp.project.sectionmaterial.service.ISectionMateria import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -35,20 +42,28 @@ public class SectionMaterialServiceImpl extends BaseServiceImpl getList(SectionMaterialVO sectionMaterialVO) { - QueryWrapper query = new QueryWrapper<>(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); //查询条件拼接 - if(null != sectionMaterialVO.getSectionId()){ - query.eq("section_id",sectionMaterialVO.getSectionId()); - } - - if(null != sectionMaterialVO.getProjectId()){ - query.eq("project_id",sectionMaterialVO.getProjectId()); - } - - if(null != sectionMaterialVO.getSectionId()){ - query.eq("section_id",sectionMaterialVO.getSectionId()); + query.eq(StringUtils.isNotBlank(sectionMaterialVO.getSectionId()),SectionMaterial::getSectionId,sectionMaterialVO.getSectionId()); + query.eq(StringUtils.isNotBlank(sectionMaterialVO.getProjectId()),SectionMaterial::getProjectId,sectionMaterialVO.getProjectId()); + query.in(sectionMaterialVO.getSectionIds()!=null,SectionMaterial::getSectionId, sectionMaterialVO.getSectionIds()); + query.like(StringUtils.isNotBlank(sectionMaterialVO.getMaterialExplain()),SectionMaterial::getMaterialExplain,sectionMaterialVO.getMaterialExplain()); + query.like(StringUtils.isNotBlank(sectionMaterialVO.getMaterialCode()),SectionMaterial::getMaterialCode,sectionMaterialVO.getMaterialCode()); + if(query.isEmptyOfWhere()){ + return new ArrayList<>() ; } return sectionMaterialMapper.selectList(query); } + + @Override + public IPage findPage(SectionMaterialVO sectionMaterialVO) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.in(SectionMaterial::getSectionId, sectionMaterialVO.getSectionIds()); + query.like(StringUtils.isNotBlank(sectionMaterialVO.getMaterialExplain()),SectionMaterial::getMaterialExplain,sectionMaterialVO.getMaterialExplain()); + query.like(StringUtils.isNotBlank(sectionMaterialVO.getMaterialCode()),SectionMaterial::getMaterialCode,sectionMaterialVO.getMaterialCode()); + IPage convert= this.page(new Page<>(sectionMaterialVO.getPageNo(), sectionMaterialVO.getPageSize()),query); + return convert; + } + } From 41d37cf24dc913922d74a56b28d56dfb4e668848 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Tue, 26 Mar 2024 15:17:16 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E5=9F=BA=E5=87=86=E9=99=90=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectentrust/entity/ebpentity/ProjBaseInfoVO.java | 7 +++++-- .../service/impl/ProjectRecordServiceImpl.java | 6 ++++-- .../ebtp/project/projectsection/entity/ProjectSection.java | 7 +++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java index f07a8da..dcd725e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java @@ -368,10 +368,10 @@ public class ProjBaseInfoVO{ @ApiModelProperty(value = "是否启用结构化报价 0否；1是") private String isStructureQuote; - @ApiModelProperty(value = "结构化报价模型 001普通报价模型") + @ApiModelProperty(value = "结构化报价模型 001普通报价模型；002联动报价模型") private String structureQuoteModel; - @ApiModelProperty(value = "结构化报价限价类型 001总价限制；002单价+总价限制") + @ApiModelProperty(value = "结构化报价限价类型 001总价限制；002单价+总价限制；003总价+基准单价限制") private String structureQuoteLimitType; @ApiModelProperty(value = "中标/中选人数量是否明确 0否；1是") @@ -394,4 +394,7 @@ public class ProjBaseInfoVO{ @ApiModelProperty(value = "中标/中选数量-to") private String winTo; + + @ApiModelProperty(value = "基准价单价限制") + private BigDecimal basePriceUnitLimit; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 116057c..257024f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -813,10 +813,12 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl materialList = new ArrayList<>(); From 4cc4275216cc7128645e25062c0ba92cdb375e51 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Wed, 22 May 2024 11:02:18 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=89=A9=E8=B5=84id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ebpentity/ProjBaseInfoVO.java | 5 +- .../ProjQuoteModelMaterialRelVO.java | 101 ++++++++++++++++++ .../ebpentity/ProjStructureQuoteModelVO.java | 68 ++++++++++++ .../entity/ebpentity/PurpMaterialVO.java | 21 ++++ .../impl/ProjectRecordServiceImpl.java | 1 + .../entity/SectionMaterial.java | 3 + 6 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java index dcd725e..7542330 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java @@ -368,7 +368,7 @@ public class ProjBaseInfoVO{ @ApiModelProperty(value = "是否启用结构化报价 0否；1是") private String isStructureQuote; - @ApiModelProperty(value = "结构化报价模型 001普通报价模型；002联动报价模型") + @ApiModelProperty(value = "结构化报价模型 001普通报价模型；002联动报价模型；003定额折扣报价模型;004非定额折扣报价模型 ") private String structureQuoteModel; @ApiModelProperty(value = "结构化报价限价类型 001总价限制；002单价+总价限制；003总价+基准单价限制") @@ -389,6 +389,9 @@ public class ProjBaseInfoVO{ @ApiModelProperty("资格条件项列表") private List templateItemList; + @ApiModelProperty("方案报价模型关联关系") + private List quoteModelVOList; + @ApiModelProperty(value = "中标/中选数量-from") private String winFrom; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java new file mode 100644 index 0000000..747cfaa --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java @@ -0,0 +1,101 @@ +package com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + * @description: caiqq + * @author: caiqq + * @create: 2024-05-10 10:45 + **/ +@Getter +@Setter +@Accessors(chain = true) +@ApiModel(value = "ProjQuoteModelMaterialRelVO对象", description = "报价模型物料关联表") +public class ProjQuoteModelMaterialRelVO { + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("方案id") + private Long projId; + + @ApiModelProperty("报价模型id") + private Long quoteModelId; + + @ApiModelProperty("建项物料行id") + private Long purpMaterialId; + + @ApiModelProperty(value = "需求单id") + private Long requId; + + @ApiModelProperty(value = "需求单物料行id") + private Long materialId; + + @ApiModelProperty(value = "建项物料是否已删除0否；1是") + private String purpMaterialIsDeleted; + + @ApiModelProperty(value = "物料编码") + private String materialCode; + + @ApiModelProperty(value = "物资说明") + private String materialDesc; + + @ApiModelProperty(value = "规格型号") + private String specModel; + + @ApiModelProperty(value = "需求数量") + private BigDecimal inRequNum; + + @ApiModelProperty(value = "计量单位") + private String unit; + + @ApiModelProperty(value = "单项不含税最高限价") + private BigDecimal singlePriceCeiling; + + @ApiModelProperty(value = "基准价单价限制") + private BigDecimal basePriceUnitLimit; + + @ApiModelProperty(value = "单位联动系数类型001固定联动002区间联动") + private String linkageCoefficientType; + + @ApiModelProperty(value = "单位联动系数") + private String linkageCoefficient; + + @ApiModelProperty(value = "折扣系数最高限制") + private BigDecimal maxDiscountFactorLimit; + + @ApiModelProperty(value = "是否基准价项1是0否") + private String basePriceItemFlag; + + @ApiModelProperty(value = "税率") + private BigDecimal taxRate; + + @ApiModelProperty(value = "权重") + private BigDecimal featureWeight; + + @ApiModelProperty("切割状态 0:切割数据 1：新数据") + private Integer cutoverStatus; + + @ApiModelProperty("租户名称") + private String tenantName; + + @ApiModelProperty("备用字段1") + private String attribute1; + + @ApiModelProperty("备用字段2") + private String attribute2; + + @ApiModelProperty("备用字段3") + private String attribute3; + + @ApiModelProperty("备用字段4") + private String attribute4; + + @ApiModelProperty("备用字段5") + private String attribute5; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java new file mode 100644 index 0000000..ec12834 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java @@ -0,0 +1,68 @@ +package com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * @description: caiqq + * @author: caiqq + * @create: 2024-05-10 10:42 + **/ +@Getter +@Setter +@Accessors(chain = true) +@ApiModel(value = "ProjStructureQuoteModelVO", description = "方案报价模型关联表") +public class ProjStructureQuoteModelVO { + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("方案id") + private Long projId; + + @ApiModelProperty("报价模型 001普通报价模型;002联动报价模型;003定额折扣报价模型;004非定额折扣报价模型") + private String structureQuoteModel; + + @ApiModelProperty("模型名称") + private String structureQuoteModelName; + + @ApiModelProperty("税率是否可偏离项:1是；0否") + private String taxDeviationFlag; + + @ApiModelProperty("规格型号是否可偏离项:1是；0否") + private String specModelFlexibilityFlag; + + @ApiModelProperty("报价小数位数限制") + private Integer decimalScaleLimit; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("切割状态 0:切割数据 1：新数据") + private Integer cutoverStatus; + + @ApiModelProperty("租户名称") + private String tenantName; + + @ApiModelProperty("备用字段1") + private String attribute1; + + @ApiModelProperty("备用字段2") + private String attribute2; + + @ApiModelProperty("备用字段3") + private String attribute3; + + @ApiModelProperty("备用字段4") + private String attribute4; + + @ApiModelProperty("备用字段5") + private String attribute5; + + @ApiModelProperty("报价模型物料关联关系") + private List modelMaterialRelVOList; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java index fd7eb50..4637a33 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java @@ -156,6 +156,27 @@ public class PurpMaterialVO { @ApiModelProperty(value = "单项不含税最高限价") private BigDecimal singlePriceCeiling; + @ApiModelProperty(value = "基准价单价限制") + private BigDecimal basePriceUnitLimit; + + @ApiModelProperty(value = "单位联动系数类型001固定联动002区间联动") + private String linkageCoefficientType; + + @ApiModelProperty(value = "单位联动系数") + private String linkageCoefficient; + + @ApiModelProperty(value = "折扣系数最高限制") + private BigDecimal maxDiscountFactorLimit; + + @ApiModelProperty(value = "是否基准价项1是0否") + private String basePriceItemFlag; + + @ApiModelProperty(value = "税率") + private BigDecimal taxRate; + + @ApiModelProperty(value = "权重") + private BigDecimal featureWeight; + @ApiModelProperty(value = "采购方式") private String purcMode; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 257024f..3a244c2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -907,6 +907,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl Date: Tue, 28 May 2024 09:07:56 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=89=A9=E8=B5=84id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuoteModelMaterialController.java | 48 ++++++++++ .../dao/QuoteModelMaterialMapper.java | 15 +++ .../dao/mapper/QuoteModelMaterialMapper.xml | 35 +++++++ .../entity/QuoteModelMaterial.java | 95 +++++++++++++++++++ .../service/IQuoteModelMaterialService.java | 16 ++++ .../impl/QuoteModelMaterialServiceImpl.java | 17 ++++ .../ProjQuoteModelMaterialRelVO.java | 6 ++ .../entity/ebpentity/PurpMaterialVO.java | 51 +++++++--- .../impl/ProjectExceptionServiceImpl.java | 27 ++++++ .../impl/ProjectRecordServiceImpl.java | 10 +- .../projectsection/entity/ProjectSection.java | 2 +- 11 files changed, 306 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/controller/QuoteModelMaterialController.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/dao/QuoteModelMaterialMapper.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/dao/mapper/QuoteModelMaterialMapper.xml create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/service/IQuoteModelMaterialService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/service/impl/QuoteModelMaterialServiceImpl.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/controller/QuoteModelMaterialController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/controller/QuoteModelMaterialController.java new file mode 100644 index 0000000..09d34f7 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/controller/QuoteModelMaterialController.java @@ -0,0 +1,48 @@ +package com.chinaunicom.mall.ebtp.project.modelmaterial.controller; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.ProjStructureQuoteModelVO; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.chinaunicom.mall.ebtp.project.modelmaterial.entity.QuoteModelMaterial; +import com.chinaunicom.mall.ebtp.project.modelmaterial.service.IQuoteModelMaterialService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +@RestController +@Api(tags = "") +@RequestMapping("/v1/quotemodelmaterial") +public class QuoteModelMaterialController{ + + @Resource + private IQuoteModelMaterialService iquoteModelMaterialService; + + /** + * 查询数据 + * + * @param id 目前主键同包id + * + * @return + */ + @ApiOperation("查询数据") + @PostMapping("/findQuoteModelMaterial/{id}") + public BaseResponse> findQuoteModelMaterial(@PathVariable String id){ + + QuoteModelMaterial quoteModelMaterial = iquoteModelMaterialService.getById(id); + if(quoteModelMaterial!=null){ + return BaseResponse.success(quoteModelMaterial.getModelMaterial()); + } + return BaseResponse.success(null); + } + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/dao/QuoteModelMaterialMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/dao/QuoteModelMaterialMapper.java new file mode 100644 index 0000000..3db1c1c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/dao/QuoteModelMaterialMapper.java @@ -0,0 +1,15 @@ +package com.chinaunicom.mall.ebtp.project.modelmaterial.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; +import com.chinaunicom.mall.ebtp.project.modelmaterial.entity.QuoteModelMaterial; + +/** +* @auto.generated +*/ +@Repository +public interface QuoteModelMaterialMapper extends BaseMapper { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/dao/mapper/QuoteModelMaterialMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/dao/mapper/QuoteModelMaterialMapper.xml new file mode 100644 index 0000000..f813cdd --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/dao/mapper/QuoteModelMaterialMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + a.id id, + a.project_id projectId, + a.section_id sectionId, + a.model_material modelMaterial, + a.project_plan_id projectPlanId, + a.create_by createBy, + a.create_date createDate, + a.update_by updateBy, + a.update_date updateDate, + + + + update biz_proj_quote_model_material + set + delete_flag="deleted" + where ID=#{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java new file mode 100644 index 0000000..c0bee4b --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java @@ -0,0 +1,95 @@ +package com.chinaunicom.mall.ebtp.project.modelmaterial.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.config.CustomJacksonTypeHandler; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.ProjStructureQuoteModelVO; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.List; + +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; + +/** + * 实体类 QuoteModelMaterial + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +@EqualsAndHashCode(callSuper = false) +@TableName(value = "biz_proj_quote_model_material", autoResultMap = true) +public class QuoteModelMaterial implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键") + private String id; + + /** + * 项目ID + */ + @ApiModelProperty(value = "项目ID") + private String projectId; + + /** + * 分包标段id + */ + @ApiModelProperty(value = "分包标段id") + private String sectionId; + + /** + * 模型及模型物资 + */ + @ApiModelProperty("方案报价模型关联关系") + @TableField(typeHandler = CustomJacksonTypeHandler.class) + private List modelMaterial; + + /** + * 方案ID（采购平台推送数据） + */ + @ApiModelProperty(value = "方案ID（采购平台推送数据）") + private String projectPlanId; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime createDate; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime updateDate; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/service/IQuoteModelMaterialService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/service/IQuoteModelMaterialService.java new file mode 100644 index 0000000..727b132 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/service/IQuoteModelMaterialService.java @@ -0,0 +1,16 @@ +package com.chinaunicom.mall.ebtp.project.modelmaterial.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaunicom.mall.ebtp.project.modelmaterial.entity.QuoteModelMaterial; + +/** + * 对数据表 biz_proj_quote_model_material 操作的 service + * @author Auto create + * + */ +public interface IQuoteModelMaterialService extends IService{ + + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/service/impl/QuoteModelMaterialServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/service/impl/QuoteModelMaterialServiceImpl.java new file mode 100644 index 0000000..e1c5a5d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/service/impl/QuoteModelMaterialServiceImpl.java @@ -0,0 +1,17 @@ +package com.chinaunicom.mall.ebtp.project.modelmaterial.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.project.modelmaterial.dao.QuoteModelMaterialMapper; +import com.chinaunicom.mall.ebtp.project.modelmaterial.entity.QuoteModelMaterial; +import com.chinaunicom.mall.ebtp.project.modelmaterial.service.IQuoteModelMaterialService; +import org.springframework.stereotype.Service; +/** + * 对数据表 biz_proj_quote_model_material 操作的 serviceImpl + * @auto.generated + * + */ +@Service +public class QuoteModelMaterialServiceImpl extends ServiceImpl implements IQuoteModelMaterialService { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java index 747cfaa..1caba33 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java @@ -39,6 +39,12 @@ public class ProjQuoteModelMaterialRelVO { @ApiModelProperty(value = "建项物料是否已删除0否；1是") private String purpMaterialIsDeleted; + @ApiModelProperty(value = "统一目录名称") + private String unifDirecName; + + @ApiModelProperty(value = "统一目录编码") + private String unifDirecCode; + @ApiModelProperty(value = "物料编码") private String materialCode; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java index 4637a33..ec2902e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java @@ -5,6 +5,8 @@ package com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,13 +22,13 @@ import java.time.LocalDateTime; *

* * @author liuyx - * @version V1.0 * @date 2020-10-06 + * @version V1.0 */ @Data @Accessors(chain = true) -@ApiModel(value = "PurpMaterial对象", description = "项目物料表") -public class PurpMaterialVO { +@ApiModel(value="PurpMaterial对象", description="项目物料表") +public class PurpMaterialVO { @ApiModelProperty(value = "采购处置内容主键") @@ -51,16 +53,19 @@ public class PurpMaterialVO { @ApiModelProperty(value = "需求单名称") private String requName; + @ApiModelProperty(value = "需求单是否启用结构化报价 0否；1是") + private String isStructureQuote; + @ApiModelProperty(value = "需求部门编号") private String deptCode; @ApiModelProperty(value = "需求部门名称") private String deptName; - @ApiModelProperty(value = "pms项目编号") + @ApiModelProperty(value = "PMS项目编号") private String pmsProjNo; - @ApiModelProperty(value = "pms项目名称") + @ApiModelProperty(value = "PMS项目名称") private String pmsProjName; @ApiModelProperty(value = "批复文号") @@ -72,13 +77,13 @@ public class PurpMaterialVO { @ApiModelProperty(value = "库存地址") private String reservePlace; - @ApiModelProperty(value = "物料编码") + @ApiModelProperty(value = "物资编码") private String materialCode; @ApiModelProperty(value = "物料行id") private String materialId; - @ApiModelProperty(value = "物料说明") + @ApiModelProperty(value = "物资说明") private String materialDesc; @ApiModelProperty(value = "物料厂家") @@ -97,7 +102,7 @@ public class PurpMaterialVO { private String inventId; @ApiModelProperty(value = "商品SKU") - private String goodsSKU; + private String goodsSku; @ApiModelProperty(value = "库龄") private String libraryAge; @@ -120,12 +125,15 @@ public class PurpMaterialVO { @ApiModelProperty(value = "需求数量") private BigDecimal requNum; - @ApiModelProperty(value = "单位") + @ApiModelProperty(value = "计量单位") private String unit; - @ApiModelProperty(value = "单价") + @ApiModelProperty(value = "不含税单价") private BigDecimal unitAmt; + @ApiModelProperty(value = "含税单价") + private BigDecimal unitPerAmt; + @ApiModelProperty(value = "采购预算（不含税）") private BigDecimal budgetAmt; @@ -182,7 +190,7 @@ public class PurpMaterialVO { @ApiModelProperty(value = "最后更新时间戳") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime lastUpdateTime; @ApiModelProperty(value = "备用字段1") @@ -222,16 +230,16 @@ public class PurpMaterialVO { @ApiModelProperty(value = "剩余数量") private BigDecimal unDealNum; - @ApiModelProperty(value = "剩余金额") + @ApiModelProperty(value = "剩余预算金额（不含税）元") private BigDecimal unBudgetAmt; - @ApiModelProperty(value = "引用金额") + @ApiModelProperty(value = "引用预算金额（不含税）元") private BigDecimal inBudgetAmt; @ApiModelProperty(value = "剩余预计预算金额（含税）元") private BigDecimal supplyBudgetAmt; - @ApiModelProperty(value = "引用预计预算金额（含税)元") + @ApiModelProperty(value = "引用预算金额（含税）元") private BigDecimal inBudgetAmtTax; @ApiModelProperty(value = "库存名称") @@ -255,12 +263,27 @@ public class PurpMaterialVO { @ApiModelProperty(value = "冻结数量") private BigDecimal frozenNum; + @ApiModelProperty(value = "库存产品id") + private String stockProductsId; + @ApiModelProperty(value = "处置价格") private BigDecimal decimalPrice; + @ApiModelProperty(value = "处置单价") + private BigDecimal decimalUnitPrice; + @ApiModelProperty(value = "供应商编号") private String supplierNo; @ApiModelProperty(value = "供应商") private String supplier; + + @ApiModelProperty(value = "闲置物资可使用数量") + private BigDecimal labelAvailabelNum; + + @ApiModelProperty(value = "是否省份 0：不是，1：是") + private String isProvince; + + @ApiModelProperty(value = "被选中的子需求") + private String rowId; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java index 1c87768..1195320 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java @@ -32,6 +32,8 @@ import com.chinaunicom.mall.ebtp.project.feign.MallPurpApi; import com.chinaunicom.mall.ebtp.project.feign.entity.AnnoVO; import com.chinaunicom.mall.ebtp.project.feign.entity.BizAssessRoom; import com.chinaunicom.mall.ebtp.project.feign.entity.ProjInvitationFailRequest; +import com.chinaunicom.mall.ebtp.project.modelmaterial.entity.QuoteModelMaterial; +import com.chinaunicom.mall.ebtp.project.modelmaterial.service.IQuoteModelMaterialService; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryNoticeVO; import com.chinaunicom.mall.ebtp.project.projectexception.dao.ProjectExceptionMapper; import com.chinaunicom.mall.ebtp.project.projectexception.entity.ProjectException; @@ -114,6 +116,8 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl getPage(ProjectExceptionVO projectExceptionVO) { @@ -416,11 +420,18 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl bidRatioList = bidRatioService.list(bidRatioQueryWrapper); //转换成map形式方便处理数据 Map> bidRatioMap = bidRatioList.stream().collect(Collectors.groupingBy(BidRatio::getSectionId)); + //查询结构化报价模型 + QueryWrapper quoteModelMaterialWrapper = new QueryWrapper<>(); + quoteModelMaterialWrapper.in("section_id",sectionIds); + List quoteModelMaterialList = quoteModelMaterialService.list(quoteModelMaterialWrapper); + //转换成map形式方便处理数据 + Map> quoteModelMaterialMap = quoteModelMaterialList.stream().collect(Collectors.groupingBy(QuoteModelMaterial::getSectionId)); //最终要插入的数据结果 List sectionSupplierAddList = new ArrayList<>(); List materialAddList = new ArrayList<>(); List bidRatioAddList = new ArrayList<>(); + List quoteModelMaterialAddList = new ArrayList<>(); //是否资审预审项目 boolean isReviewMethod = projectRecordService.isReviewMethod(projectRecord); @@ -472,6 +483,18 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl modelMaterialList = quoteModelMaterialMap.get(section.getParentSectionId()); + if (null != modelMaterialList && !modelMaterialList.isEmpty()) { + for (QuoteModelMaterial modelMaterial : modelMaterialList) { + modelMaterial.setSectionId(section.getId()); + modelMaterial.setProjectId(projectRecord.getId()); + modelMaterial.setCreateDate(null); + modelMaterial.setUpdateDate(null); + modelMaterial.setId(section.getId()); + } + quoteModelMaterialAddList.addAll(modelMaterialList); + } } projectRecord.setCreateDate(null); @@ -494,6 +517,10 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl{ @@ -916,7 +924,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl Date: Fri, 31 May 2024 14:00:04 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-=E6=8A=A5=E4=BB=B7=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=89=A9=E8=B5=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/QuoteModelMaterial.java | 31 ------------------- .../impl/ProjectRecordServiceImpl.java | 6 ++-- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java index c0bee4b..dc503a2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java @@ -61,35 +61,4 @@ public class QuoteModelMaterial implements Serializable { @ApiModelProperty(value = "方案ID（采购平台推送数据）") private String projectPlanId; - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) - private java.time.LocalDateTime createDate; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) - private java.time.LocalDateTime updateDate; - - } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index d3e1beb..9a16172 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -853,8 +853,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl Date: Fri, 31 May 2024 14:20:59 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-=E6=8A=A5=E4=BB=B7=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=89=A9=E8=B5=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectExceptionServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java index 1195320..80981bc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java @@ -489,8 +489,6 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl Date: Thu, 13 Jun 2024 10:10:29 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=8B=9B=E6=A0=87?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=8E=A5=E5=8F=A3=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java index 00406fc..3062bee 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java @@ -26,6 +26,7 @@ public interface MallPurpApi { * @return 返回结果 */ @PostMapping("/api/mall-purp/v1/purpImplement/projInvitationFail") + @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "方案招标失败接口") BaseResponse projInvitationFail(@RequestBody ProjInvitationFailRequest failRequest); From 79e22f300eed6e92e26184e958985436a036c505 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Thu, 13 Jun 2024 10:14:22 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=8B=9B=E6=A0=87?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=8E=A5=E5=8F=A3=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java index 3062bee..dede923 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java @@ -26,7 +26,7 @@ public interface MallPurpApi { * @return 返回结果 */ @PostMapping("/api/mall-purp/v1/purpImplement/projInvitationFail") - @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "方案招标失败接口") + @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.UPDATE,detail = "方案招标失败接口") BaseResponse projInvitationFail(@RequestBody ProjInvitationFailRequest failRequest); @@ -36,7 +36,7 @@ public interface MallPurpApi { * @return 返回结果 */ @PostMapping("/api/mall-purp/v1/purpBaseInfo/findDataByPurpImplmentId") - @OperationLogDetail(businessModule = EbtpLogBusinessModule.PROJECT_ENTRUST_INIT,operationType = EbtpLogType.INSERT,detail = "委托项目信息出始化-委托信息") + @OperationLogDetail(businessModule = EbtpLogBusinessModule.PROJECT_ENTRUST_INIT,operationType = EbtpLogType.SELECT,detail = "委托项目信息出始化-委托信息") BaseResponse findDataByPurpImplmentId(@RequestParam("purpImplmentId") Long purpImplmentId); From 13756540c7e81e253b0026adc9b6a479a7cb8bc1 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Fri, 28 Jun 2024 16:46:25 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-=E6=8A=A5=E4=BB=B7=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=89=A9=E8=B5=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebpentity/ProjQuoteModelMaterialRelVO.java | 12 ++++++------ .../entity/ebpentity/ProjStructureQuoteModelVO.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java index 1caba33..3ddb2a0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java @@ -19,22 +19,22 @@ import java.math.BigDecimal; @ApiModel(value = "ProjQuoteModelMaterialRelVO对象", description = "报价模型物料关联表") public class ProjQuoteModelMaterialRelVO { @ApiModelProperty("id") - private Long id; + private String id; @ApiModelProperty("方案id") - private Long projId; + private String projId; @ApiModelProperty("报价模型id") - private Long quoteModelId; + private String quoteModelId; @ApiModelProperty("建项物料行id") - private Long purpMaterialId; + private String purpMaterialId; @ApiModelProperty(value = "需求单id") - private Long requId; + private String requId; @ApiModelProperty(value = "需求单物料行id") - private Long materialId; + private String materialId; @ApiModelProperty(value = "建项物料是否已删除0否；1是") private String purpMaterialIsDeleted; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java index ec12834..501e58a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java @@ -19,10 +19,10 @@ import java.util.List; @ApiModel(value = "ProjStructureQuoteModelVO", description = "方案报价模型关联表") public class ProjStructureQuoteModelVO { @ApiModelProperty("id") - private Long id; + private String id; @ApiModelProperty("方案id") - private Long projId; + private String projId; @ApiModelProperty("报价模型 001普通报价模型;002联动报价模型;003定额折扣报价模型;004非定额折扣报价模型") private String structureQuoteModel; From 7052047ea638b41f63194073655cb64152b24757 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Wed, 10 Jul 2024 11:40:56 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-=E6=A0=B9=E6=8D=AE=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E6=A8=A1=E5=9E=8B=E5=A1=AB=E5=85=85=E6=A0=87=E6=AE=B5?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectRecordServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 9a16172..8482825 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -856,6 +856,18 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl Date: Thu, 11 Jul 2024 13:53:51 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-=E7=89=A9=E8=B5=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E7=BB=9F=E4=B8=80=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectrecord/service/impl/ProjectRecordServiceImpl.java | 1 + .../ebtp/project/sectionmaterial/entity/SectionMaterial.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 8482825..4b229fe 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -943,6 +943,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl Date: Wed, 24 Jul 2024 10:52:38 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-goodsSku=20goodsSKU=20=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E6=9C=89=E5=8F=98=E5=8C=96=20=20=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B2=A1=E7=94=A8=E5=88=B0=20=20=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/projectentrust/entity/ebpentity/PurpMaterialVO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java index ec2902e..239f72f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java @@ -5,6 +5,7 @@ package com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; @@ -102,6 +103,7 @@ public class PurpMaterialVO { private String inventId; @ApiModelProperty(value = "商品SKU") + @JsonIgnoreProperties private String goodsSku; @ApiModelProperty(value = "库龄") From 172b6692cd5a90098a43f583b96c4a8c7330508a Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Wed, 24 Jul 2024 11:37:15 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-goodsSku=20goodsSKU=20=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E6=9C=89=E5=8F=98=E5=8C=96=20=20=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B2=A1=E7=94=A8=E5=88=B0=20=20=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E5=BF=BD=E7=95=A5=E4=B8=8D=E5=A5=BD=E4=BD=BF?= =?UTF-8?q?=20=20=E6=B3=A8=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectentrust/entity/ebpentity/PurpMaterialVO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java index 239f72f..9c0b8d1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java @@ -102,9 +102,9 @@ public class PurpMaterialVO { @ApiModelProperty(value = "库存id") private String inventId; - @ApiModelProperty(value = "商品SKU") - @JsonIgnoreProperties - private String goodsSku; +// @ApiModelProperty(value = "商品SKU") +// @JsonIgnoreProperties +// private String goodsSku; @ApiModelProperty(value = "库龄") private String libraryAge; From 46f8f73b91c988b9303c4564b907d68f613b111b Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Wed, 24 Jul 2024 12:11:26 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88-=E9=A1=B9=E7=9B=AE=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=BB=99=E7=9A=84goodsSku=E4=B8=8E=E4=B9=8B=E5=89=8Dg?= =?UTF-8?q?oodsSKU=20=E6=9C=89=E5=8F=98=E5=8C=96=20=20=E5=9B=A0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=94=A8=E7=9A=84=E6=98=AFgoodsSKU=20=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E6=95=B0=E6=8D=AE=E5=87=BA=E9=94=99=20=E8=BF=98?= =?UTF-8?q?=E7=94=A8goodsSKU?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectentrust/entity/ebpentity/PurpMaterialVO.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java index 9c0b8d1..03a5e8e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java @@ -102,9 +102,8 @@ public class PurpMaterialVO { @ApiModelProperty(value = "库存id") private String inventId; -// @ApiModelProperty(value = "商品SKU") -// @JsonIgnoreProperties -// private String goodsSku; + @ApiModelProperty(value = "商品SKU") + private String goodsSKU; @ApiModelProperty(value = "库龄") private String libraryAge; From 853b059bb95428d30d10ffded76e0cbb8ec0baeb Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Fri, 9 Aug 2024 11:15:15 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E9=87=8D=E8=AF=84=E6=8E=A7=E5=88=B6-?= =?UTF-8?q?=E5=8D=95=E4=B8=80=E6=9D=A5=E6=BA=90=E7=AE=80=E5=8C=96=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=8D=E8=83=BD=E9=87=8D=E8=AF=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectReEvaluationServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java index 5ece897..3c698ff 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java @@ -319,6 +319,10 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl Date: Fri, 9 Aug 2024 11:32:41 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E9=87=8D=E8=AF=84=E6=8E=A7=E5=88=B6-?= =?UTF-8?q?=E5=8D=95=E4=B8=80=E6=9D=A5=E6=BA=90=E7=AE=80=E5=8C=96=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=8D=E8=83=BD=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectExceptionServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java index 80981bc..20bc337 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java @@ -139,6 +139,13 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl