diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBidPreProject.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBidPreProject.java index 42dcd675..859e94da 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBidPreProject.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBidPreProject.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -97,7 +98,7 @@ public class XzdBidPreProject extends BaseEntity { /** * 投资单位 */ - private String investmentUnit; + private Long investmentUnit; /** @@ -118,12 +119,12 @@ public class XzdBidPreProject extends BaseEntity { /** * 工程造价（万元） */ - private Long projectCost; + private BigDecimal projectCost; /** * 资料费 */ - private Long informationCost; + private BigDecimal informationCost; /** * 文件ID diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBqlxProjectInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBqlxProjectInfo.java index 83636141..3acbbbb6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBqlxProjectInfo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBqlxProjectInfo.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.time.LocalDate; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -56,9 +57,15 @@ public class XzdBqlxProjectInfo extends BaseEntity { * 填报组织 */ @ExcelProperty(value = "填报组织") - private String reportingOrganization; + private Long reportingOrganization; + /** + * 填报部门 + */ + + private Long tbDept; + /** * 报名截止时间 */ @@ -92,7 +99,7 @@ public class XzdBqlxProjectInfo extends BaseEntity { /** * 工期要求（天） */ - private Long durationDays; + private BigDecimal durationDays; /** * 最低资质要求 @@ -127,12 +134,12 @@ public class XzdBqlxProjectInfo extends BaseEntity { /** * 投标保证金 */ - private Long biddingDeposit; + private BigDecimal biddingDeposit; /** * 建设单位 */ - private String constructionUnit; + private Long constructionUnit; /** * 建设单位联系人 @@ -147,7 +154,7 @@ public class XzdBqlxProjectInfo extends BaseEntity { /** * 招标单位 */ - private String biddingUnit; + private Long biddingUnit; /** * 招标单位联系人 @@ -162,12 +169,12 @@ public class XzdBqlxProjectInfo extends BaseEntity { /** * 成本价 */ - private Long costPrice; + private BigDecimal costPrice; /** * 招标控制价 */ - private Long biddingPriceControl; + private BigDecimal biddingPriceControl; /** * 项目编码 @@ -177,12 +184,12 @@ public class XzdBqlxProjectInfo extends BaseEntity { /** * 默认财务组织 */ - private String defaultFinance; + private Long defaultFinance; /** * 涉及财务组织 */ - private String involveFinance; + private Long involveFinance; /** * 文件ID diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdProjectRiskAssessment.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdProjectRiskAssessment.java index f7a30d5a..c2fc2649 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdProjectRiskAssessment.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdProjectRiskAssessment.java @@ -35,7 +35,7 @@ public class XzdProjectRiskAssessment extends BaseEntity { /** * 项目名称 */ - private String projectName; + private Long projectName; /** * 项目业主 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBidPreProjectBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBidPreProjectBo.java index a91b4356..c84a346c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBidPreProjectBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBidPreProjectBo.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -119,19 +120,19 @@ public class XzdBidPreProjectBo extends BaseEntity { /** * 投资单位 */ - private String investmentUnit; + private Long investmentUnit; /** * 工程造价（万元） */ @NotNull(message = "工程造价（万元）不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long projectCost; + private BigDecimal projectCost; /** * 资料费 */ @NotNull(message = "资料费不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long informationCost; + private BigDecimal informationCost; /** * 文件ID diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBqlxProjectInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBqlxProjectInfoBo.java index de7a80f6..e86aff62 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBqlxProjectInfoBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBqlxProjectInfoBo.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -76,7 +77,13 @@ public class XzdBqlxProjectInfoBo extends BaseEntity { * 填报组织 */ @ExcelProperty(value = "填报组织") - private String reportingOrganization; + private Long reportingOrganization; + + + /** + * 填报部门 + */ + private Long tbDept; /** @@ -92,7 +99,7 @@ public class XzdBqlxProjectInfoBo extends BaseEntity { /** * 工期要求（天） */ - private Long durationDays; + private BigDecimal durationDays; /** * 最低资质要求 @@ -127,12 +134,12 @@ public class XzdBqlxProjectInfoBo extends BaseEntity { /** * 投标保证金 */ - private Long biddingDeposit; + private BigDecimal biddingDeposit; /** * 建设单位 */ - private String constructionUnit; + private Long constructionUnit; /** * 建设单位联系人 @@ -147,7 +154,7 @@ public class XzdBqlxProjectInfoBo extends BaseEntity { /** * 招标单位 */ - private String biddingUnit; + private Long biddingUnit; /** * 招标单位联系人 @@ -162,12 +169,12 @@ public class XzdBqlxProjectInfoBo extends BaseEntity { /** * 成本价 */ - private Long costPrice; + private BigDecimal costPrice; /** * 招标控制价 */ - private Long biddingPriceControl; + private BigDecimal biddingPriceControl; /** * 项目编码 @@ -178,12 +185,12 @@ public class XzdBqlxProjectInfoBo extends BaseEntity { /** * 默认财务组织 */ - private String defaultFinance; + private Long defaultFinance; /** * 涉及财务组织 */ - private String involveFinance; + private Long involveFinance; /** * 文件ID diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdProjectRiskAssessmentBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdProjectRiskAssessmentBo.java index 5022ce31..52c281f4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdProjectRiskAssessmentBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdProjectRiskAssessmentBo.java @@ -33,7 +33,9 @@ public class XzdProjectRiskAssessmentBo extends BaseEntity { /** * 项目名称 */ - private String projectName; + private Long projectName; + + /** * 项目业主 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBidPreProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBidPreProjectVo.java index a21cd3f8..62ff8aa3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBidPreProjectVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBidPreProjectVo.java @@ -1,6 +1,7 @@ package org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo; import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; @@ -12,6 +13,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -128,7 +130,7 @@ public class XzdBidPreProjectVo implements Serializable { */ @ExcelProperty(value = "工程造价", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "万=元") - private Long projectCost; + private BigDecimal projectCost; @@ -140,7 +142,13 @@ public class XzdBidPreProjectVo implements Serializable { /** * 联投单位 */ - private String jointInvestmentEntity; + private Long jointInvestmentEntity; + + /** + * 联投单位 + */ + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "jointInvestmentEntity") + private String jointInvestmentEntityName; /** * 联系方式 @@ -150,7 +158,7 @@ public class XzdBidPreProjectVo implements Serializable { * 资料费 */ @ExcelProperty(value = "资料费") - private Long informationCost; + private BigDecimal informationCost; /** * 文件ID diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBqlxProjectInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBqlxProjectInfoVo.java index 2f97cb28..e550590d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBqlxProjectInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBqlxProjectInfoVo.java @@ -1,8 +1,11 @@ package org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo; +import java.math.BigDecimal; import java.time.LocalDate; import java.util.Date; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBqlxProjectInfo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -76,7 +79,25 @@ public class XzdBqlxProjectInfoVo implements Serializable { * 填报组织 */ @ExcelProperty(value = "填报组织") - private String reportingOrganization; + private Long reportingOrganization; + + /** + * 填报组织 + */ + @ExcelProperty(value = "填报组织") + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "reportingOrganization") + private String reportingOrganizationName; + + /** + * 填报部门 + */ + private Long tbDept; + + /** + * 填报部门 + */ + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "tbDept") + private String tbDeptName; /** * 设计情况 @@ -107,7 +128,7 @@ public class XzdBqlxProjectInfoVo implements Serializable { */ @ExcelProperty(value = "工期要求", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "天=") - private Long durationDays; + private BigDecimal durationDays; /** * 最低资质要求 @@ -151,13 +172,20 @@ public class XzdBqlxProjectInfoVo implements Serializable { * 投标保证金 */ @ExcelProperty(value = "投标保证金") - private Long biddingDeposit; + private BigDecimal biddingDeposit; /** * 建设单位 */ @ExcelProperty(value = "建设单位") - private String constructionUnit; + private Long constructionUnit; + + /** + * 建设单位 + */ + @ExcelProperty(value = "建设单位") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "constructionUnit") + private String constructionUnitName; /** * 建设单位联系人 @@ -175,7 +203,13 @@ public class XzdBqlxProjectInfoVo implements Serializable { * 招标单位 */ @ExcelProperty(value = "招标单位") - private String biddingUnit; + private Long biddingUnit; + /** + * 招标单位 + */ + @ExcelProperty(value = "招标单位") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "biddingUnit") + private String biddingUnitName; /** * 招标单位联系人 @@ -193,13 +227,13 @@ public class XzdBqlxProjectInfoVo implements Serializable { * 成本价 */ @ExcelProperty(value = "成本价") - private Long costPrice; + private BigDecimal costPrice; /** * 招标控制价 */ @ExcelProperty(value = "招标控制价") - private Long biddingPriceControl; + private BigDecimal biddingPriceControl; /** * 项目编码 @@ -211,13 +245,25 @@ public class XzdBqlxProjectInfoVo implements Serializable { * 默认财务组织 */ @ExcelProperty(value = "默认财务组织") - private String defaultFinance; + private Long defaultFinance; + /** + * 默认财务组织 + */ + @ExcelProperty(value = "默认财务组织") + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "defaultFinance") + private String defaultFinanceName; /** * 涉及财务组织 */ @ExcelProperty(value = "涉及财务组织") - private String involveFinance; + private Long involveFinance; + /** + * 涉及财务组织 + */ + @ExcelProperty(value = "涉及财务组织") + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "involveFinance") + private String involveFinanceName; /** * 文件ID diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdProjectRiskAssessmentVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdProjectRiskAssessmentVo.java index d64ebb75..d3f5f8e8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdProjectRiskAssessmentVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdProjectRiskAssessmentVo.java @@ -45,7 +45,13 @@ public class XzdProjectRiskAssessmentVo implements Serializable { * 项目名称 */ @ExcelProperty(value = "项目名称") - private String projectName; + private Long projectName; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectNames; /** * 项目业主 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java index 58265422..5f15a586 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java @@ -75,6 +75,7 @@ public class XzdBidPreProjectServiceImpl extends ServiceImpl queryPageList(XzdProjectByVo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper1(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::saveValue); return TableDataInfo.build(result); } @@ -87,7 +108,7 @@ public class XzdProjectRiskAssessmentServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(XzdProjectRiskAssessment::getId); lqw.eq(StringUtils.isNotBlank(bo.getDocumentNumber()), XzdProjectRiskAssessment::getDocumentNumber, bo.getDocumentNumber()); - lqw.like(StringUtils.isNotBlank(bo.getProjectName()), XzdProjectRiskAssessment::getProjectName, bo.getProjectName()); + lqw.like(bo.getProjectName() != null, XzdProjectRiskAssessment::getProjectName, bo.getProjectName()); lqw.eq(StringUtils.isNotBlank(bo.getProjectBusinessOwner()), XzdProjectRiskAssessment::getProjectBusinessOwner, bo.getProjectBusinessOwner()); lqw.eq(StringUtils.isNotBlank(bo.getJointBodyMembers()), XzdProjectRiskAssessment::getJointBodyMembers, bo.getJointBodyMembers()); lqw.eq(bo.getEstimatedContractAmount() != null, XzdProjectRiskAssessment::getEstimatedContractAmount, bo.getEstimatedContractAmount()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/XzdBiddingFileEstimate.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/XzdBiddingFileEstimate.java index b15c91b9..96e8226f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/XzdBiddingFileEstimate.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/XzdBiddingFileEstimate.java @@ -44,7 +44,7 @@ public class XzdBiddingFileEstimate extends BaseEntity { /** * 项目名称 */ - private String projectName; + private Long projectName; /** * 标题 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/bo/XzdBiddingFileEstimateBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/bo/XzdBiddingFileEstimateBo.java index b6e2e86d..ff0cdf67 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/bo/XzdBiddingFileEstimateBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/bo/XzdBiddingFileEstimateBo.java @@ -41,7 +41,7 @@ public class XzdBiddingFileEstimateBo extends BaseEntity { /** * 项目名称 */ - private String projectName; + private Long projectName; /** * 标题 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java index 60a3084d..6b64189e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java @@ -55,7 +55,14 @@ public class XzdBiddingFileEstimateVo implements Serializable { * 项目名称 */ @ExcelProperty(value = "项目名称") - private String projectName; + private Long projectName; + + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectNames; /** * 标题 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/service/impl/XzdBiddingFileEstimateServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/service/impl/XzdBiddingFileEstimateServiceImpl.java index 9bd353da..fffee8ab 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/service/impl/XzdBiddingFileEstimateServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/service/impl/XzdBiddingFileEstimateServiceImpl.java @@ -11,7 +11,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QuerListXzdBidPreVo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService; import org.dromara.xzd.utilS.AreaUtil; import org.springframework.stereotype.Service; import org.dromara.xzd.biddingManagement.biddingDocument.domain.bo.XzdBiddingFileEstimateBo; @@ -43,6 +45,8 @@ public class XzdBiddingFileEstimateServiceImpl extends ServiceImpl queryPageList(XzdBiddingFileEstimateBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::saveValue); return TableDataInfo.build(result); } @@ -90,7 +108,7 @@ public class XzdBiddingFileEstimateServiceImpl extends ServiceImpl queryPageList(XzdBiddingAgencyFeePaymentBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::saveValue); return TableDataInfo.build(result); } @@ -90,7 +109,7 @@ public class XzdBiddingAgencyFeePaymentServiceImpl extends ServiceImpl