From b1f554b54b9426a88888bc9e6780fd6b2a68119b Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Mon, 25 Dec 2023 11:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=BB=93=E6=9E=84=E5=8C=96-?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E8=B5=84=E6=A0=BC=E6=9D=A1=E4=BB=B6=E5=BA=93?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/BizQualifyConditionItemMapper.java | 15 ++ .../mapper/BizQualifyConditionItemMapper.xml | 57 ++++++ .../entity/BizQualifyConditionItem.java | 168 ++++++++++++++++++ .../IBizQualifyConditionItemService.java | 16 ++ .../BizQualifyConditionItemServiceImpl.java | 17 ++ .../entity/ebpentity/ProjBaseInfoVO.java | 4 + .../impl/ProjectRecordServiceImpl.java | 27 ++- 7 files changed, 299 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/dao/BizQualifyConditionItemMapper.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/dao/mapper/BizQualifyConditionItemMapper.xml create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/entity/BizQualifyConditionItem.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/service/IBizQualifyConditionItemService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/service/impl/BizQualifyConditionItemServiceImpl.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/dao/BizQualifyConditionItemMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/dao/BizQualifyConditionItemMapper.java new file mode 100644 index 0000000..68d6327 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/dao/BizQualifyConditionItemMapper.java @@ -0,0 +1,15 @@ +package com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; +import com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.entity.BizQualifyConditionItem; + +/** +* @auto.generated +*/ +@Repository +public interface BizQualifyConditionItemMapper extends BaseMapper { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/dao/mapper/BizQualifyConditionItemMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/dao/mapper/BizQualifyConditionItemMapper.xml new file mode 100644 index 0000000..de66774 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/dao/mapper/BizQualifyConditionItemMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + a.id id, + a.is_reference isReference, + a.template_id templateId, + a.template_name templateName, + a.template_version_no templateVersionNo, + a.procurement_method procurementMethod, + a.source_item_id sourceItemId, + a.source_item_version_no sourceItemVersionNo, + a.category category, + a.is_config_item isConfigItem, + a.item_description itemDescription, + a.m_value_one mValueOne, + a.m_value_two mValueTwo, + a.item_note itemNote, + a.project_id projectId, + a.section_id sectionId, + a.create_by createBy, + a.create_date createDate, + a.update_by updateBy, + a.update_date updateDate, + + + + update biz_qualify_condition_item + 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/bidqualifyconditionitem/entity/BizQualifyConditionItem.java b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/entity/BizQualifyConditionItem.java new file mode 100644 index 0000000..456ffd3 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/entity/BizQualifyConditionItem.java @@ -0,0 +1,168 @@ +package com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +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; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.math.BigDecimal; + +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; + +/** + * 实体类 BizQualifyConditionItem + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "BizQualifyConditionItem对象", description = "资格条件模板-资格条件项（页面手动新增或来自资格条件库引用）") +@EqualsAndHashCode(callSuper = false) +@TableName(value = "biz_qualify_condition_item", autoResultMap = true) +public class BizQualifyConditionItem implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty(value = "") + private String id; + + /** + * 是否来自引用，0-否，1-是 + */ + @ApiModelProperty(value = "是否来自引用，0-否，1-是") + private String isReference; + + /** + * 模板id + */ + @ApiModelProperty(value = "模板id") + private String templateId; + + /** + * 模板名称 + */ + @ApiModelProperty(value = "模板名称") + private String templateName; + + /** + * 模板版本号 + */ + @ApiModelProperty(value = "模板版本号") + private String templateVersionNo; + + /** + * 采购方式：1-公开招标类，2-非公开招标类(可多选，采用英文,分隔)，\n" + + "引用的条件项存储原始条件项采购方式，手动新增的存储方案的采购方式，\n" + + "采购方式对应：公开招标-公开招标+邀请招标；非公开招标：竞争性谈判、单一来源、询价、公开比选、公开直购 + */ + @ApiModelProperty(value = "采购方式：1-公开招标类，2-非公开招标类(可多选，采用英文,分隔)，\n" + + "引用的条件项存储原始条件项采购方式，手动新增的存储方案的采购方式，\n" + + "采购方式对应：公开招标-公开招标+邀请招标；非公开招标：竞争性谈判、单一来源、询价、公开比选、公开直购") + private String procurementMethod; + + /** + * 引用条件项原始id(qualify_condition_item中id) + */ + @ApiModelProperty(value = "引用条件项原始id(qualify_condition_item中id)") + private String sourceItemId; + + /** + * 引用条件项版本号 + */ + @ApiModelProperty(value = "引用条件项版本号") + private String sourceItemVersionNo; + + /** + * 资格条件项分类 + */ + @ApiModelProperty(value = "资格条件项分类") + private String category; + + /** + * 是否需要配置项：1-是，0-否（如果选择是，则在资格条件中用M代替配置项具体值，可以在资格条件模板和采购方案中引用时修改配置项） + */ + @ApiModelProperty(value = "是否需要配置项：1-是，0-否（如果选择是，则在资格条件中用M代替配置项具体值，可以在资格条件模板和采购方案中引用时修改配置项）") + private String isConfigItem; + + /** + * 资格条件描述 + */ + @ApiModelProperty(value = "资格条件描述") + private String itemDescription; + + /** + * m值，被乘数，固定的值50 + */ + @ApiModelProperty(value = "m值，被乘数，固定的值50") + private BigDecimal mValueOne; + + /** + * m值，乘数 + */ + @ApiModelProperty(value = "m值，乘数") + private BigDecimal mValueTwo; + + /** + * 资格条件释义 + */ + @ApiModelProperty(value = "资格条件释义") + private String itemNote; + + /** + * 项目ID + */ + @ApiModelProperty(value = "项目ID") + private String projectId; + + /** + * 分包标段id + */ + @ApiModelProperty(value = "分包标段id") + private String sectionId; + + /** + * 创建者 + */ + @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; + + @ApiModelProperty("方案主键id,表proj_base_info主键") + @JsonSerialize(using = ToStringSerializer.class) + @TableField(exist = false) + private Long projId; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/service/IBizQualifyConditionItemService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/service/IBizQualifyConditionItemService.java new file mode 100644 index 0000000..dc0464c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/service/IBizQualifyConditionItemService.java @@ -0,0 +1,16 @@ +package com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.entity.BizQualifyConditionItem; + +/** + * 对数据表 biz_qualify_condition_item 操作的 service + * @author Auto create + * + */ +public interface IBizQualifyConditionItemService extends IService{ + + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/service/impl/BizQualifyConditionItemServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/service/impl/BizQualifyConditionItemServiceImpl.java new file mode 100644 index 0000000..16ace65 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/bidqualifyconditionitem/service/impl/BizQualifyConditionItemServiceImpl.java @@ -0,0 +1,17 @@ +package com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.dao.BizQualifyConditionItemMapper; +import com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.entity.BizQualifyConditionItem; +import com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.service.IBizQualifyConditionItemService; +import org.springframework.stereotype.Service; +/** + * 对数据表 biz_qualify_condition_item 操作的 serviceImpl + * @auto.generated + * + */ +@Service +public class BizQualifyConditionItemServiceImpl extends ServiceImpl implements IBizQualifyConditionItemService { + + +} 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 11b9755..c5dba0b 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 @@ -4,6 +4,7 @@ package com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity; import com.baomidou.mybatisplus.annotation.TableId; +import com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.entity.BizQualifyConditionItem; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -385,5 +386,8 @@ public class ProjBaseInfoVO{ @ApiModelProperty(value = "份额分配/(中标/中选分配原则)") private String shareAllocation; + @ApiModelProperty("资格条件项列表") + private List templateItemList; + } 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 18323a1..dc1542b 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 @@ -17,6 +17,8 @@ import com.chinaunicom.mall.ebtp.common.constant.EbtpRoleEnum; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; import com.chinaunicom.mall.ebtp.common.util.JsonUtils; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.entity.BizQualifyConditionItem; +import com.chinaunicom.mall.ebtp.project.bidqualifyconditionitem.service.IBizQualifyConditionItemService; import com.chinaunicom.mall.ebtp.project.bidratio.entity.BidRatio; import com.chinaunicom.mall.ebtp.project.bidratio.service.IBidRatioService; import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckUtil; @@ -130,6 +132,8 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl templateItemList = (List)resultMap.get("templateItemList"); + if(null != templateItemList){ + qualifyConditionItemService.saveBatch(templateItemList); + } List materialList = (List)resultMap.get("materialList"); if(null != materialList){ @@ -758,7 +766,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl materialList = new ArrayList<>(); List supplierList = new ArrayList<>(); List bidRatioList = new ArrayList<>(); - + List templateItemList = new ArrayList<>(); //项目标段序号 int sectionOrderNumber = 1; for(PurpBaseInfoVO purpBaseInfoVo:expand.getPurpImplementSendVO().getPurpBaseInfoVoList()){ @@ -821,13 +829,22 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl{ + v.setProjectId(section.getProjectId()); + v.setSectionId(section.getId()); + v.setId(PropertyUtils.getSnowflakeId()); + }); + templateItemList.addAll(projBaseInfoVO.getTemplateItemList()); + } //供应商 supplierList.addAll(assembleSupplier(record.getId(),section.getId(),projBaseInfoVO.getProjSuppRelVOList())); sectionList.add(section); } - return getStringObjectMap(record, sectionList, materialList, supplierList,bidRatioList); + return getStringObjectMap(record, sectionList, materialList, supplierList,bidRatioList,templateItemList); } /** @@ -916,7 +933,6 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl materialList = new ArrayList<>(assembleInquiryMaterial(record.getId(), section.getId(), inquiryVO.getInquiryGoodsList())); sectionList.add(section); - return getStringObjectMap(record, sectionList, materialList, supplierList,null); + return getStringObjectMap(record, sectionList, materialList, supplierList,null,null); } /** @@ -1095,13 +1111,14 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl getStringObjectMap(ProjectRecord record, List sectionList, List materialList, List supplierList,List bidRatioList) { + private Map getStringObjectMap(ProjectRecord record, List sectionList, List materialList, List supplierList,List bidRatioList,List templateItemList) { Map resultMap = new HashMap<>(); resultMap.put("projectRecord", record); resultMap.put("sectionList", sectionList); resultMap.put("materialList", materialList); resultMap.put("supplierList", supplierList); resultMap.put("bidRatioList", bidRatioList); + resultMap.put("templateItemList", templateItemList); //zhqbin 校验非法字符，长度 checkUtil.checkInquiryVO(resultMap); return resultMap;