From 8352da03ee5ab72ad01c3e268d29efc3a0db3789 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Thu, 21 Aug 2025 17:01:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E9=87=87=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusBiddingLimitListController.java | 4 +- .../domain/BusBiddingLimitVersions.java | 56 ++++++++ .../bo/BiddingAllVersionNumbersReq.java | 25 ++++ .../domain/bo/BusBiddingLimitVersionsBo.java | 58 ++++++++ .../domain/vo/BusBiddingLimitVersionsVo.java | 68 +++++++++ .../mapper/BusBiddingLimitVersionsMapper.java | 15 ++ .../service/IBusBiddingLimitListService.java | 4 +- .../IBusBiddingLimitVersionsService.java | 70 +++++++++ .../impl/BusBiddingLimitListServiceImpl.java | 27 ++-- .../BusBiddingLimitVersionsServiceImpl.java | 134 +++++++++++++++++ ...usBillofquantitiesLimitListController.java | 16 +-- .../BusTenderPlanLimitListController.java | 9 +- .../tender/domain/BusBLimitListVersions.java | 56 ++++++++ .../domain/bo/BusBLimitListVersionsBo.java | 58 ++++++++ .../domain/bo/TenderAllVersionNumbersReq.java | 24 ++++ .../domain/vo/BusBLimitListVersionsVo.java | 68 +++++++++ .../mapper/BusBLimitListVersionsMapper.java | 15 ++ .../IBusBLimitListVersionsService.java | 70 +++++++++ .../IBusBillofquantitiesLimitListService.java | 5 +- .../BusBLimitListVersionsServiceImpl.java | 135 ++++++++++++++++++ ...sBillofquantitiesLimitListServiceImpl.java | 28 ++-- .../bidding/BusBiddingLimitVersionsMapper.xml | 7 + .../tender/BusBLimitListVersionsMapper.xml | 7 + 23 files changed, 916 insertions(+), 43 deletions(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/BusBiddingLimitVersions.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BiddingAllVersionNumbersReq.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusBiddingLimitVersionsBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitVersionsVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/mapper/BusBiddingLimitVersionsMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitVersionsService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitVersionsServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusBLimitListVersions.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusBLimitListVersionsBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderAllVersionNumbersReq.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBLimitListVersionsVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBLimitListVersionsMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBLimitListVersionsService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBLimitListVersionsServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/bidding/BusBiddingLimitVersionsMapper.xml create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBLimitListVersionsMapper.xml diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusBiddingLimitListController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusBiddingLimitListController.java index 6055b241..85185e6c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusBiddingLimitListController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusBiddingLimitListController.java @@ -5,7 +5,9 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.bidding.domain.bo.BusBiddingLimitListBo; +import org.dromara.bidding.domain.bo.BiddingAllVersionNumbersReq; import org.dromara.bidding.domain.vo.BusBiddingLimitListVo; +import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo; import org.dromara.bidding.service.IBusBiddingLimitListService; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.EditGroup; @@ -57,7 +59,7 @@ public class BusBiddingLimitListController extends BaseController { */ @SaCheckPermission("bidding:biddingLimitList:obtainAllVersionNumbers") @GetMapping("/obtainAllVersionNumbers") - public R> obtainAllVersionNumbers(BusBiddingLimitListBo bo) { + public R> obtainAllVersionNumbers(BiddingAllVersionNumbersReq bo) { return R.ok(busBiddingLimitListService.obtainAllVersionNumbers(bo)); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/BusBiddingLimitVersions.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/BusBiddingLimitVersions.java new file mode 100644 index 00000000..e45ef015 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/BusBiddingLimitVersions.java @@ -0,0 +1,56 @@ +package org.dromara.bidding.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 成本- 投标版本对象 bus_bidding_limit_versions + * + * @author Lion Li + * @date 2025-08-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("bus_bidding_limit_versions") +public class BusBiddingLimitVersions extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 项目Id + */ + private Long projectId; + + /** + * 工单类型(字典) + */ + private String workOrderType; + + /** + * 版本号 + */ + private String versions; + + /** + * excel文件 + */ + private String excelFile; + + /** + * 流程审核状态 + */ + private String status; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BiddingAllVersionNumbersReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BiddingAllVersionNumbersReq.java new file mode 100644 index 00000000..9a48b462 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BiddingAllVersionNumbersReq.java @@ -0,0 +1,25 @@ +package org.dromara.bidding.domain.bo; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@Accessors(chain = true) +public class BiddingAllVersionNumbersReq implements Serializable { + /** + * 工单类型(字典) + */ + @NotBlank(message = "工单类型(字典)不能为空") + private String workOrderType; + + /** + * 项目ID + */ + @NotNull(message = "项目ID不能为空") + private Long projectId; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusBiddingLimitVersionsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusBiddingLimitVersionsBo.java new file mode 100644 index 00000000..2f49e01c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusBiddingLimitVersionsBo.java @@ -0,0 +1,58 @@ +package org.dromara.bidding.domain.bo; + +import org.dromara.bidding.domain.BusBiddingLimitVersions; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 成本- 投标版本业务对象 bus_bidding_limit_versions + * + * @author Lion Li + * @date 2025-08-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BusBiddingLimitVersions.class, reverseConvertGenerate = false) +public class BusBiddingLimitVersionsBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 项目Id + */ + @NotNull(message = "项目Id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long projectId; + + /** + * 工单类型(字典) + */ + @NotBlank(message = "工单类型(字典)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String workOrderType; + + /** + * 版本号 + */ + @NotBlank(message = "版本号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String versions; + + /** + * excel文件 + */ + private String excelFile; + + /** + * 流程审核状态 + */ + private String status; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitVersionsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitVersionsVo.java new file mode 100644 index 00000000..d1e73501 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitVersionsVo.java @@ -0,0 +1,68 @@ +package org.dromara.bidding.domain.vo; + +import org.dromara.bidding.domain.BusBiddingLimitVersions; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 成本- 投标版本视图对象 bus_bidding_limit_versions + * + * @author Lion Li + * @date 2025-08-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BusBiddingLimitVersions.class) +public class BusBiddingLimitVersionsVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 项目Id + */ + @ExcelProperty(value = "项目Id") + private Long projectId; + + /** + * 工单类型(字典) + */ + @ExcelProperty(value = "工单类型(字典)") + private String workOrderType; + + /** + * 版本号 + */ + @ExcelProperty(value = "版本号") + private String versions; + + /** + * excel文件 + */ + @ExcelProperty(value = "excel文件") + private String excelFile; + + /** + * 流程审核状态 + */ + @ExcelProperty(value = "流程审核状态") + private String status; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/mapper/BusBiddingLimitVersionsMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/mapper/BusBiddingLimitVersionsMapper.java new file mode 100644 index 00000000..89406d7e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/mapper/BusBiddingLimitVersionsMapper.java @@ -0,0 +1,15 @@ +package org.dromara.bidding.mapper; + +import org.dromara.bidding.domain.BusBiddingLimitVersions; +import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 成本- 投标版本Mapper接口 + * + * @author Lion Li + * @date 2025-08-21 + */ +public interface BusBiddingLimitVersionsMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitListService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitListService.java index abde3cac..faa8695e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitListService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitListService.java @@ -1,8 +1,10 @@ package org.dromara.bidding.service; +import org.dromara.bidding.domain.bo.BiddingAllVersionNumbersReq; import org.dromara.bidding.domain.vo.BusBiddingLimitListVo; import org.dromara.bidding.domain.bo.BusBiddingLimitListBo; import org.dromara.bidding.domain.BusBiddingLimitList; +import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -79,7 +81,7 @@ public interface IBusBiddingLimitListService extends IService obtainAllVersionNumbers(BusBiddingLimitListBo bo); + List obtainAllVersionNumbers(BiddingAllVersionNumbersReq bo); List sheetList(BusBiddingLimitListBo bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitVersionsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitVersionsService.java new file mode 100644 index 00000000..e7091a86 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitVersionsService.java @@ -0,0 +1,70 @@ +package org.dromara.bidding.service; + +import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo; +import org.dromara.bidding.domain.bo.BusBiddingLimitVersionsBo; +import org.dromara.bidding.domain.BusBiddingLimitVersions; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 成本- 投标版本Service接口 + * + * @author Lion Li + * @date 2025-08-21 + */ +public interface IBusBiddingLimitVersionsService extends IService{ + + /** + * 查询成本- 投标版本 + * + * @param id 主键 + * @return 成本- 投标版本 + */ + BusBiddingLimitVersionsVo queryById(Long id); + + /** + * 分页查询成本- 投标版本列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 成本- 投标版本分页列表 + */ + TableDataInfo queryPageList(BusBiddingLimitVersionsBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的成本- 投标版本列表 + * + * @param bo 查询条件 + * @return 成本- 投标版本列表 + */ + List queryList(BusBiddingLimitVersionsBo bo); + + /** + * 新增成本- 投标版本 + * + * @param bo 成本- 投标版本 + * @return 是否新增成功 + */ + Boolean insertByBo(BusBiddingLimitVersionsBo bo); + + /** + * 修改成本- 投标版本 + * + * @param bo 成本- 投标版本 + * @return 是否修改成功 + */ + Boolean updateByBo(BusBiddingLimitVersionsBo bo); + + /** + * 校验并批量删除成本- 投标版本信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitListServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitListServiceImpl.java index e026b8ea..713d1eac 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitListServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitListServiceImpl.java @@ -9,9 +9,13 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.bidding.domain.BusBiddingLimitList; import org.dromara.bidding.domain.bo.BusBiddingLimitListBo; +import org.dromara.bidding.domain.bo.BusBiddingLimitVersionsBo; +import org.dromara.bidding.domain.bo.BiddingAllVersionNumbersReq; import org.dromara.bidding.domain.vo.BusBiddingLimitListVo; +import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo; import org.dromara.bidding.mapper.BusBiddingLimitListMapper; import org.dromara.bidding.service.IBusBiddingLimitListService; +import org.dromara.bidding.service.IBusBiddingLimitVersionsService; import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -19,6 +23,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.utils.excel.ExcelDynamicReader; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -39,6 +44,9 @@ import java.util.stream.Collectors; @Service public class BusBiddingLimitListServiceImpl extends ServiceImpl implements IBusBiddingLimitListService { + @Autowired + private IBusBiddingLimitVersionsService busBiddingLimitVersionsService; + /** * 查询成本-投标 * @@ -205,16 +213,15 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl obtainAllVersionNumbers(BusBiddingLimitListBo bo) { - List busBiddingLimitLists = baseMapper.selectList(new LambdaQueryWrapper() - .select(BusBiddingLimitList::getVersions) - .eq(bo.getProjectId() != null, BusBiddingLimitList::getProjectId, bo.getProjectId()) - .orderByDesc(BusBiddingLimitList::getCreateTime) - .groupBy(BusBiddingLimitList::getVersions)); - return busBiddingLimitLists.stream() - .filter(Objects::nonNull) - .map(BusBiddingLimitList::getVersions) - .collect(Collectors.toList()); + public List obtainAllVersionNumbers(BiddingAllVersionNumbersReq bo) { + + BusBiddingLimitVersionsBo biddingLimitVersionsBo = new BusBiddingLimitVersionsBo(); + biddingLimitVersionsBo.setProjectId(bo.getProjectId()); + biddingLimitVersionsBo.setWorkOrderType(bo.getWorkOrderType()); + + + + return busBiddingLimitVersionsService.queryList(biddingLimitVersionsBo); } @Override diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitVersionsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitVersionsServiceImpl.java new file mode 100644 index 00000000..6be6e6c5 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitVersionsServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.bidding.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.bidding.domain.bo.BusBiddingLimitVersionsBo; +import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo; +import org.dromara.bidding.domain.BusBiddingLimitVersions; +import org.dromara.bidding.mapper.BusBiddingLimitVersionsMapper; +import org.dromara.bidding.service.IBusBiddingLimitVersionsService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 成本- 投标版本Service业务层处理 + * + * @author Lion Li + * @date 2025-08-21 + */ +@RequiredArgsConstructor +@Service +public class BusBiddingLimitVersionsServiceImpl extends ServiceImpl implements IBusBiddingLimitVersionsService { + + private final BusBiddingLimitVersionsMapper baseMapper; + + /** + * 查询成本- 投标版本 + * + * @param id 主键 + * @return 成本- 投标版本 + */ + @Override + public BusBiddingLimitVersionsVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询成本- 投标版本列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 成本- 投标版本分页列表 + */ + @Override + public TableDataInfo queryPageList(BusBiddingLimitVersionsBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的成本- 投标版本列表 + * + * @param bo 查询条件 + * @return 成本- 投标版本列表 + */ + @Override + public List queryList(BusBiddingLimitVersionsBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(BusBiddingLimitVersionsBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(BusBiddingLimitVersions::getCreateTime); + lqw.eq(bo.getProjectId() != null, BusBiddingLimitVersions::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getWorkOrderType()), BusBiddingLimitVersions::getWorkOrderType, bo.getWorkOrderType()); + lqw.eq(StringUtils.isNotBlank(bo.getExcelFile()), BusBiddingLimitVersions::getExcelFile, bo.getExcelFile()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), BusBiddingLimitVersions::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增成本- 投标版本 + * + * @param bo 成本- 投标版本 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BusBiddingLimitVersionsBo bo) { + BusBiddingLimitVersions add = MapstructUtils.convert(bo, BusBiddingLimitVersions.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改成本- 投标版本 + * + * @param bo 成本- 投标版本 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BusBiddingLimitVersionsBo bo) { + BusBiddingLimitVersions update = MapstructUtils.convert(bo, BusBiddingLimitVersions.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BusBiddingLimitVersions entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除成本- 投标版本信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBillofquantitiesLimitListController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBillofquantitiesLimitListController.java index bc0da908..6eaa8711 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBillofquantitiesLimitListController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBillofquantitiesLimitListController.java @@ -6,10 +6,8 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.design.domain.bo.ImportExcelFileReq; -import org.dromara.design.domain.bo.ObtainAllVersionNumbersReq; -import org.dromara.design.domain.bo.SheetListReq; -import org.dromara.design.domain.vo.BusBillofquantitiesVersionsVo; +import org.dromara.tender.domain.bo.TenderAllVersionNumbersReq; +import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; import org.dromara.tender.enums.LimitListTypeEnum; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -18,14 +16,12 @@ import org.dromara.common.log.annotation.Log; import org.dromara.common.web.core.BaseController; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo; import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo; import org.dromara.tender.service.IBusBillofquantitiesLimitListService; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.springframework.web.multipart.MultipartFile; /** @@ -64,17 +60,17 @@ public class BusBillofquantitiesLimitListController extends BaseController { /** * 获取所有版本号 */ - @SaCheckPermission("design:billofquantitiesLimitList:obtainAllVersionNumbers") + @SaCheckPermission("tender:billofquantitiesLimitList:obtainAllVersionNumbers") @GetMapping("/obtainAllVersionNumbers") - public R> obtainAllVersionNumbers(BusBillofquantitiesLimitListBo bo) { - bo.setType(LimitListTypeEnum.COMPANY.getCode()); + public R> obtainAllVersionNumbers(TenderAllVersionNumbersReq bo) { + bo.setWorkOrderType(LimitListTypeEnum.COMPANY.getCode()); return R.ok(busBillofquantitiesLimitListService.obtainAllVersionNumbers(bo)); } /** * 获取指定版本的sheet */ - @SaCheckPermission("design:billofquantitiesLimitList:sheetList") + @SaCheckPermission("tender:billofquantitiesLimitList:sheetList") @GetMapping("/sheetList") public R> sheetList(BusBillofquantitiesLimitListBo bo) { bo.setType(LimitListTypeEnum.COMPANY.getCode()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusTenderPlanLimitListController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusTenderPlanLimitListController.java index 943fa8ea..cd2afc02 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusTenderPlanLimitListController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusTenderPlanLimitListController.java @@ -14,8 +14,9 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.web.core.BaseController; import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo; +import org.dromara.tender.domain.bo.TenderAllVersionNumbersReq; +import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo; -import org.dromara.tender.enums.LimitListTypeEnum; import org.dromara.tender.service.IBusBillofquantitiesLimitListService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -57,16 +58,16 @@ public class BusTenderPlanLimitListController extends BaseController { /** * 获取所有版本号 */ - @SaCheckPermission("design:tenderPlanLimitList:obtainAllVersionNumbers") + @SaCheckPermission("tender:tenderPlanLimitList:obtainAllVersionNumbers") @GetMapping("/obtainAllVersionNumbers") - public R> obtainAllVersionNumbers(BusBillofquantitiesLimitListBo bo) { + public R> obtainAllVersionNumbers(TenderAllVersionNumbersReq bo) { return R.ok(busBillofquantitiesLimitListService.obtainAllVersionNumbers(bo)); } /** * 获取指定版本的sheet */ - @SaCheckPermission("design:tenderPlanLimitList:sheetList") + @SaCheckPermission("tender:tenderPlanLimitList:sheetList") @GetMapping("/sheetList") public R> sheetList(BusBillofquantitiesLimitListBo bo) { return R.ok(busBillofquantitiesLimitListService.sheetList(bo)); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusBLimitListVersions.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusBLimitListVersions.java new file mode 100644 index 00000000..bcb0a505 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusBLimitListVersions.java @@ -0,0 +1,56 @@ +package org.dromara.tender.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 成本-限价版本对象 bus_b_limit_list_versions + * + * @author Lion Li + * @date 2025-08-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("bus_b_limit_list_versions") +public class BusBLimitListVersions extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 项目Id + */ + private Long projectId; + + /** + * 工单类型(字典) + */ + private String workOrderType; + + /** + * 版本号 + */ + private String versions; + + /** + * excel文件 + */ + private String excelFile; + + /** + * 流程审核状态 + */ + private String status; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusBLimitListVersionsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusBLimitListVersionsBo.java new file mode 100644 index 00000000..4bc4bb17 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusBLimitListVersionsBo.java @@ -0,0 +1,58 @@ +package org.dromara.tender.domain.bo; + +import org.dromara.tender.domain.BusBLimitListVersions; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 成本-限价版本业务对象 bus_b_limit_list_versions + * + * @author Lion Li + * @date 2025-08-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BusBLimitListVersions.class, reverseConvertGenerate = false) +public class BusBLimitListVersionsBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 项目Id + */ + @NotNull(message = "项目Id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long projectId; + + /** + * 工单类型(字典) + */ + @NotBlank(message = "工单类型(字典)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String workOrderType; + + /** + * 版本号 + */ + @NotBlank(message = "版本号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String versions; + + /** + * excel文件 + */ + private String excelFile; + + /** + * 流程审核状态 + */ + private String status; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderAllVersionNumbersReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderAllVersionNumbersReq.java new file mode 100644 index 00000000..8e0f4d4c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderAllVersionNumbersReq.java @@ -0,0 +1,24 @@ +package org.dromara.tender.domain.bo; + +import jakarta.validation.constraints.*; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@Accessors(chain = true) +public class TenderAllVersionNumbersReq implements Serializable { + /** + * 工单类型(字典) + */ + @NotBlank(message = "工单类型(字典)不能为空") + private String workOrderType; + + /** + * 项目ID + */ + @NotNull(message = "项目ID不能为空") + private Long projectId; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBLimitListVersionsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBLimitListVersionsVo.java new file mode 100644 index 00000000..e54f6610 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBLimitListVersionsVo.java @@ -0,0 +1,68 @@ +package org.dromara.tender.domain.vo; + +import org.dromara.tender.domain.BusBLimitListVersions; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 成本-限价版本视图对象 bus_b_limit_list_versions + * + * @author Lion Li + * @date 2025-08-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BusBLimitListVersions.class) +public class BusBLimitListVersionsVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 项目Id + */ + @ExcelProperty(value = "项目Id") + private Long projectId; + + /** + * 工单类型(字典) + */ + @ExcelProperty(value = "工单类型(字典)") + private String workOrderType; + + /** + * 版本号 + */ + @ExcelProperty(value = "版本号") + private String versions; + + /** + * excel文件 + */ + @ExcelProperty(value = "excel文件") + private String excelFile; + + /** + * 流程审核状态 + */ + @ExcelProperty(value = "流程审核状态") + private String status; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBLimitListVersionsMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBLimitListVersionsMapper.java new file mode 100644 index 00000000..9edcf0db --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBLimitListVersionsMapper.java @@ -0,0 +1,15 @@ +package org.dromara.tender.mapper; + +import org.dromara.tender.domain.BusBLimitListVersions; +import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 成本-限价版本Mapper接口 + * + * @author Lion Li + * @date 2025-08-21 + */ +public interface BusBLimitListVersionsMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBLimitListVersionsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBLimitListVersionsService.java new file mode 100644 index 00000000..2e1dd5bf --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBLimitListVersionsService.java @@ -0,0 +1,70 @@ +package org.dromara.tender.service; + +import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; +import org.dromara.tender.domain.bo.BusBLimitListVersionsBo; +import org.dromara.tender.domain.BusBLimitListVersions; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 成本-限价版本Service接口 + * + * @author Lion Li + * @date 2025-08-21 + */ +public interface IBusBLimitListVersionsService extends IService{ + + /** + * 查询成本-限价版本 + * + * @param id 主键 + * @return 成本-限价版本 + */ + BusBLimitListVersionsVo queryById(Long id); + + /** + * 分页查询成本-限价版本列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 成本-限价版本分页列表 + */ + TableDataInfo queryPageList(BusBLimitListVersionsBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的成本-限价版本列表 + * + * @param bo 查询条件 + * @return 成本-限价版本列表 + */ + List queryList(BusBLimitListVersionsBo bo); + + /** + * 新增成本-限价版本 + * + * @param bo 成本-限价版本 + * @return 是否新增成功 + */ + Boolean insertByBo(BusBLimitListVersionsBo bo); + + /** + * 修改成本-限价版本 + * + * @param bo 成本-限价版本 + * @return 是否修改成功 + */ + Boolean updateByBo(BusBLimitListVersionsBo bo); + + /** + * 校验并批量删除成本-限价版本信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBillofquantitiesLimitListService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBillofquantitiesLimitListService.java index ce589c09..ab3ede02 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBillofquantitiesLimitListService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBillofquantitiesLimitListService.java @@ -1,6 +1,7 @@ package org.dromara.tender.service; -import org.dromara.design.domain.vo.BusBillofquantitiesVersionsVo; +import org.dromara.tender.domain.bo.TenderAllVersionNumbersReq; +import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo; import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo; import org.dromara.tender.domain.BusBillofquantitiesLimitList; @@ -80,7 +81,7 @@ public interface IBusBillofquantitiesLimitListService extends IService obtainAllVersionNumbers(BusBillofquantitiesLimitListBo bo); + List obtainAllVersionNumbers(TenderAllVersionNumbersReq bo); /** * 获取指定版本的sheet diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBLimitListVersionsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBLimitListVersionsServiceImpl.java new file mode 100644 index 00000000..996594e2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBLimitListVersionsServiceImpl.java @@ -0,0 +1,135 @@ +package org.dromara.tender.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.tender.domain.bo.BusBLimitListVersionsBo; +import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; +import org.dromara.tender.domain.BusBLimitListVersions; +import org.dromara.tender.mapper.BusBLimitListVersionsMapper; +import org.dromara.tender.service.IBusBLimitListVersionsService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 成本-限价版本Service业务层处理 + * + * @author Lion Li + * @date 2025-08-21 + */ +@RequiredArgsConstructor +@Service +public class BusBLimitListVersionsServiceImpl extends ServiceImpl implements IBusBLimitListVersionsService { + + private final BusBLimitListVersionsMapper baseMapper; + + /** + * 查询成本-限价版本 + * + * @param id 主键 + * @return 成本-限价版本 + */ + @Override + public BusBLimitListVersionsVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询成本-限价版本列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 成本-限价版本分页列表 + */ + @Override + public TableDataInfo queryPageList(BusBLimitListVersionsBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的成本-限价版本列表 + * + * @param bo 查询条件 + * @return 成本-限价版本列表 + */ + @Override + public List queryList(BusBLimitListVersionsBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(BusBLimitListVersionsBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(BusBLimitListVersions::getId); + lqw.eq(bo.getProjectId() != null, BusBLimitListVersions::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getWorkOrderType()), BusBLimitListVersions::getWorkOrderType, bo.getWorkOrderType()); + lqw.eq(StringUtils.isNotBlank(bo.getVersions()), BusBLimitListVersions::getVersions, bo.getVersions()); + lqw.eq(StringUtils.isNotBlank(bo.getExcelFile()), BusBLimitListVersions::getExcelFile, bo.getExcelFile()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), BusBLimitListVersions::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增成本-限价版本 + * + * @param bo 成本-限价版本 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BusBLimitListVersionsBo bo) { + BusBLimitListVersions add = MapstructUtils.convert(bo, BusBLimitListVersions.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改成本-限价版本 + * + * @param bo 成本-限价版本 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BusBLimitListVersionsBo bo) { + BusBLimitListVersions update = MapstructUtils.convert(bo, BusBLimitListVersions.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BusBLimitListVersions entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除成本-限价版本信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBillofquantitiesLimitListServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBillofquantitiesLimitListServiceImpl.java index 14ddca12..45bd688a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBillofquantitiesLimitListServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBillofquantitiesLimitListServiceImpl.java @@ -1,10 +1,8 @@ package org.dromara.tender.service.impl; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.coryUtils.ExcelReader; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,8 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.utils.excel.ExcelDynamicReader; -import org.dromara.design.domain.BusBillofquantities; -import org.dromara.design.domain.dto.MaterialsAndEquipmentExcelDto; +import org.dromara.tender.domain.bo.BusBLimitListVersionsBo; +import org.dromara.tender.domain.bo.TenderAllVersionNumbersReq; +import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; +import org.dromara.tender.service.IBusBLimitListVersionsService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo; import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo; @@ -39,6 +40,9 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl obtainAllVersionNumbers(BusBillofquantitiesLimitListBo bo) { - List busBillofquantitiesLimitLists = baseMapper.selectList(new LambdaQueryWrapper() - .select(BusBillofquantitiesLimitList::getVersions) - .eq(bo.getProjectId() != null, BusBillofquantitiesLimitList::getProjectId, bo.getProjectId()) - .eq(StringUtils.isNotBlank(bo.getType()), BusBillofquantitiesLimitList::getType, bo.getType()) - .orderByDesc(BusBillofquantitiesLimitList::getCreateTime) - .groupBy(BusBillofquantitiesLimitList::getVersions)); - return busBillofquantitiesLimitLists.stream() - .filter(Objects::nonNull) - .map(BusBillofquantitiesLimitList::getVersions) - .collect(Collectors.toList()); + public List obtainAllVersionNumbers(TenderAllVersionNumbersReq bo) { + BusBLimitListVersionsBo listVersions = new BusBLimitListVersionsBo(); + listVersions.setProjectId(bo.getProjectId()); + listVersions.setWorkOrderType(bo.getWorkOrderType()); + return busBLimitListVersionsService.queryList(listVersions); } @Override diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/bidding/BusBiddingLimitVersionsMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/bidding/BusBiddingLimitVersionsMapper.xml new file mode 100644 index 00000000..ea3ed1fb --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/bidding/BusBiddingLimitVersionsMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBLimitListVersionsMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBLimitListVersionsMapper.xml new file mode 100644 index 00000000..3fe522bb --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBLimitListVersionsMapper.xml @@ -0,0 +1,7 @@ + + + + +