From 86945b912246ece12fbb45a8388c200a2bd2df82 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Thu, 21 Aug 2025 21:41:20 +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=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusBiddingLimitListController.java | 10 +++++++ .../BusListOfWinningBidsController.java | 6 ++--- .../service/IBusBiddingLimitListService.java | 3 +++ .../service/IBusListOfWinningBidsService.java | 3 +++ .../impl/BusBiddingLimitListServiceImpl.java | 7 +++++ .../impl/BusListOfWinningBidsServiceImpl.java | 27 ++++++++++++++----- ...usBillofquantitiesLimitListController.java | 7 +++-- .../BusTenderPlanLimitListController.java | 13 +++++++-- .../TenderSupplierInputController.java | 11 +++++++- .../dromara/tender/domain/BusBiddingPlan.java | 5 ++++ .../domain/BusSegmentedIndicatorPlanning.java | 2 +- .../tender/domain/bo/BusBiddingPlanBo.java | 5 ++++ .../tender/domain/vo/BusBiddingPlanVo.java | 5 ++++ .../vo/BusBillofquantitiesLimitListVo.java | 10 ++++--- .../BusBillofquantitiesLimitListMapper.java | 1 + .../IBusBillofquantitiesLimitListService.java | 9 ++++++- .../service/ITenderSupplierInputService.java | 2 ++ .../impl/BusBiddingPlanServiceImpl.java | 4 ++- ...sBillofquantitiesLimitListServiceImpl.java | 23 ++++++++++++---- ...SegmentedIndicatorPlanningServiceImpl.java | 9 ++++--- .../impl/TenderSupplierInputServiceImpl.java | 15 +++++++++++ .../BusBillofquantitiesLimitListMapper.xml | 3 ++- 22 files changed, 148 insertions(+), 32 deletions(-) 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 85185e6c..6bc31d45 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 @@ -16,6 +16,7 @@ import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; +import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -63,6 +64,15 @@ public class BusBiddingLimitListController extends BaseController { return R.ok(busBiddingLimitListService.obtainAllVersionNumbers(bo)); } + /** + * 获取所有版本详细信息 + */ + @SaCheckPermission("bidding:biddingLimitList:getVersionDetail") + @GetMapping("/getVersionDetail/{id}") + public R getVersionDetail(@NotNull(message = "id不能为空") @PathVariable Long id) { + return R.ok(busBiddingLimitListService.getVersionDetail(id)); + } + /** * 获取指定版本的sheet */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusListOfWinningBidsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusListOfWinningBidsController.java index f6d3876e..3b0ed6e9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusListOfWinningBidsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusListOfWinningBidsController.java @@ -41,8 +41,8 @@ public class BusListOfWinningBidsController extends BaseController { */ @SaCheckPermission("bidding:listOfWinningBids:list") @GetMapping("/list") - public TableDataInfo list(BusListOfWinningBidsBo bo, PageQuery pageQuery) { - return busListOfWinningBidsService.queryPageList(bo, pageQuery); + public R list(BusListOfWinningBidsBo bo) { + return R.ok(busListOfWinningBidsService.queryOne(bo)); } /** @@ -75,7 +75,7 @@ public class BusListOfWinningBidsController extends BaseController { @Log(title = "中标项目一览", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody BusListOfWinningBidsBo bo) { + public R add(@RequestBody BusListOfWinningBidsBo bo) { return toAjax(busListOfWinningBidsService.insertByBo(bo)); } 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 faa8695e..737f3fe9 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 @@ -9,6 +9,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; import org.springframework.web.multipart.MultipartFile; import java.util.Collection; @@ -84,4 +85,6 @@ public interface IBusBiddingLimitListService extends IService obtainAllVersionNumbers(BiddingAllVersionNumbersReq bo); List sheetList(BusBiddingLimitListBo bo); + + BusBiddingLimitVersionsVo getVersionDetail(Long id); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusListOfWinningBidsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusListOfWinningBidsService.java index 981abcde..6c0de3be 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusListOfWinningBidsService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusListOfWinningBidsService.java @@ -3,6 +3,7 @@ package org.dromara.bidding.service; import org.dromara.bidding.domain.vo.BusListOfWinningBidsVo; import org.dromara.bidding.domain.bo.BusListOfWinningBidsBo; import org.dromara.bidding.domain.BusListOfWinningBids; +import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -67,4 +68,6 @@ public interface IBusListOfWinningBidsService extends IService ids, Boolean isValid); + + BusListOfWinningBidsVo queryOne(BusListOfWinningBidsBo bo); } 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 713d1eac..6cfda834 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 @@ -23,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.dromara.tender.domain.vo.BusBLimitListVersionsVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -238,6 +239,12 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl 0; - if (flag) { - bo.setId(add.getId()); + if (bo.getId() == null) { + BusListOfWinningBids add = MapstructUtils.convert(bo, BusListOfWinningBids.class); + Long count = baseMapper.selectCount(new LambdaQueryWrapper().eq(BusListOfWinningBids::getProjectId, bo.getProjectId())); + if (count > 0) { + throw new ServiceException("项目已存在不允许新增"); + } + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; } - return flag; + return updateByBo(bo); } /** @@ -145,4 +154,10 @@ public class BusListOfWinningBidsServiceImpl extends ServiceImpl 0; } + + @Override + public BusListOfWinningBidsVo queryOne(BusListOfWinningBidsBo bo) { + return baseMapper.selectVoOne(new LambdaQueryWrapper() + .eq(BusListOfWinningBids::getProjectId, bo.getProjectId())); + } } 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 6eaa8711..63d83eb3 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 @@ -63,7 +63,6 @@ public class BusBillofquantitiesLimitListController extends BaseController { @SaCheckPermission("tender:billofquantitiesLimitList:obtainAllVersionNumbers") @GetMapping("/obtainAllVersionNumbers") public R> obtainAllVersionNumbers(TenderAllVersionNumbersReq bo) { - bo.setWorkOrderType(LimitListTypeEnum.COMPANY.getCode()); return R.ok(busBillofquantitiesLimitListService.obtainAllVersionNumbers(bo)); } @@ -73,7 +72,7 @@ public class BusBillofquantitiesLimitListController extends BaseController { @SaCheckPermission("tender:billofquantitiesLimitList:sheetList") @GetMapping("/sheetList") public R> sheetList(BusBillofquantitiesLimitListBo bo) { - bo.setType(LimitListTypeEnum.COMPANY.getCode()); +// bo.setType(LimitListTypeEnum.COMPANY.getCode()); return R.ok(busBillofquantitiesLimitListService.sheetList(bo)); } @@ -96,8 +95,8 @@ public class BusBillofquantitiesLimitListController extends BaseController { @Log(title = "导入excel", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/importExcelFile") - public R importExcelFile(Long projectId, @RequestParam("file") MultipartFile file) throws Exception { - return toAjax(busBillofquantitiesLimitListService.importExcelFile(projectId, file)); + public R importExcelFile(BusBillofquantitiesLimitListBo bo, @RequestParam("file") MultipartFile file) throws Exception { + return toAjax(busBillofquantitiesLimitListService.importExcelFile(bo, file)); } /** 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 cd2afc02..a80bec35 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 @@ -64,6 +64,15 @@ public class BusTenderPlanLimitListController extends BaseController { return R.ok(busBillofquantitiesLimitListService.obtainAllVersionNumbers(bo)); } + /** + * 获取所有版本详细信息 + */ + @SaCheckPermission("tender:tenderPlanLimitList:getVersionDetail") + @GetMapping("/getVersionDetail/{id}") + public R getVersionDetail(Long id) { + return R.ok(busBillofquantitiesLimitListService.getVersionDetail(id)); + } + /** * 获取指定版本的sheet */ @@ -91,8 +100,8 @@ public class BusTenderPlanLimitListController extends BaseController { @Log(title = "导入excel", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/importExcelFile") - public R importExcelFile(Long projectId, @RequestParam("file") MultipartFile file) throws Exception { - return toAjax(busBillofquantitiesLimitListService.importExcelFile(projectId, file)); + public R importExcelFile(BusBillofquantitiesLimitListBo bo, @RequestParam("file") MultipartFile file) throws Exception { + return toAjax(busBillofquantitiesLimitListService.importExcelFile(bo, file)); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java index e84bb04d..7305224e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java @@ -54,6 +54,15 @@ public class TenderSupplierInputController extends BaseController { return tenderSupplierInputService.queryPageList(bo, pageQuery); } + /** + * 查询供应商入库列表 + */ + @SaCheckPermission("supplierInput:supplierInput:getList") + @GetMapping("/getList") + public R> list(TenderSupplierInputBo bo) { + return R.ok(tenderSupplierInputService.getList(bo)); + } + /** * 导出供应商入库列表 */ @@ -98,7 +107,7 @@ public class TenderSupplierInputController extends BaseController { public R edit(TenderSupplierInputBo bo,@RequestPart("file") MultipartFile file) { return toAjax(tenderSupplierInputService.updateByBo(bo,file)); } - + /** * 删除供应商入库 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusBiddingPlan.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusBiddingPlan.java index 360c8472..4281e105 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusBiddingPlan.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusBiddingPlan.java @@ -102,5 +102,10 @@ public class BusBiddingPlan extends BaseEntity { */ private String winningBidder; + /** + * 中标单位id + */ + private Long winningBidderId; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusSegmentedIndicatorPlanning.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusSegmentedIndicatorPlanning.java index d1ce26ca..c93d0fad 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusSegmentedIndicatorPlanning.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusSegmentedIndicatorPlanning.java @@ -56,7 +56,7 @@ public class BusSegmentedIndicatorPlanning extends BaseEntity { /** * 总价 */ - private Long price; + private BigDecimal price; /** * 分包内容 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusBiddingPlanBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusBiddingPlanBo.java index 58e320c6..9f5ad16a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusBiddingPlanBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusBiddingPlanBo.java @@ -104,6 +104,11 @@ public class BusBiddingPlanBo extends BaseEntity { */ private Integer status; + /** + * 中标单位id + */ + private Long winningBidderId; + /** * 限价一览表ids */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBiddingPlanVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBiddingPlanVo.java index 0177bd08..ab9fa112 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBiddingPlanVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBiddingPlanVo.java @@ -120,5 +120,10 @@ public class BusBiddingPlanVo implements Serializable { */ private String winningBidder; + /** + * 中标单位id + */ + private Long winningBidderId; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBillofquantitiesLimitListVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBillofquantitiesLimitListVo.java index 23dd99df..c3edeec7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBillofquantitiesLimitListVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusBillofquantitiesLimitListVo.java @@ -73,16 +73,18 @@ public class BusBillofquantitiesLimitListVo implements Serializable { @ExcelProperty(value = "编号") private String num; + /** + * 类型 + */ + @ExcelProperty(value = "类型") + private String type; + /** * 名称 */ @ExcelProperty(value = "名称") private String name; - /** - * 类型 - */ - private String type; /** * 规格 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBillofquantitiesLimitListMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBillofquantitiesLimitListMapper.java index 4eeada5a..e589dc7b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBillofquantitiesLimitListMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBillofquantitiesLimitListMapper.java @@ -16,5 +16,6 @@ import java.util.List; public interface BusBillofquantitiesLimitListMapper extends BaseMapperPlus { + //,@Param("type") String type List selectListBySids(@Param("sids") List sids); } 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 ab3ede02..70bd1a56 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 @@ -94,7 +94,14 @@ public interface IBusBillofquantitiesLimitListService extends IService getListByIds(List ids); + + /** + * 获取版本详细信息 + * @param id + * @return + */ + BusBLimitListVersionsVo getVersionDetail(Long id); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java index 0e4dddaa..09746cde 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java @@ -70,4 +70,6 @@ ITenderSupplierInputService extends IService{ * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + List getList(TenderSupplierInputBo bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java index ce2273ec..a0c3e25b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java @@ -174,7 +174,6 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl planAnnexVoList = busBiddingPlanAnnexService.queryList(planAnnex); if (planAnnexVoList != null && !planAnnexVoList.isEmpty() ) { - if (!bidFile.isEmpty()){ SysOssUploadVo wordEntity = ossService.uploadWithNoSave(bidFile, ossService.minioFileName(FormalitiesAnnex,bidFile)); update.setBidFile(wordEntity.getUrl()); @@ -234,6 +233,9 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl billofquantitiesLimitListList = busBillofquantitiesLimitListService.getListByIds(ids); + if (billofquantitiesLimitListList.isEmpty()){ + return billofquantitiesLimitListList; + } List list = billofquantitiesLimitListList.stream().distinct().collect(Collectors.toList()); for (BusBillofquantitiesLimitListVo limitList : list) { for (BusTenderPlanningLimitList limitList1 : planningLimitListList) { 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 45bd688a..523de325 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 @@ -13,6 +13,7 @@ import org.dromara.common.utils.excel.ExcelDynamicReader; 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.enums.LimitListTypeEnum; import org.dromara.tender.service.IBusBLimitListVersionsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -159,8 +160,11 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl vo.getUnitPrice() !=null && vo.getUnitPrice().compareTo(BigDecimal.ZERO) != 0) .filter(vo ->vo.getQuantity() !=null && vo.getQuantity().compareTo(BigDecimal.ZERO) != 0) .forEach(item -> { - item.setPrice(item.getUnitPrice().multiply(item.getQuantity()).setScale(2, RoundingMode.HALF_UP)); - }); + item.setPrice(item.getUnitPrice().multiply(item.getQuantity()).setScale(2, RoundingMode.HALF_UP)); + }); + if (bo.getType().equals(LimitListTypeEnum.SPECIAL.getCode())){ + return listVoList; + } //构建父子映射 Map> parentMap = listVoList.stream() @@ -195,7 +199,7 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl busBillofquantities = new ArrayList(); @@ -214,7 +218,8 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl { BusBillofquantitiesLimitList limitList = new BusBillofquantitiesLimitList(); limitList.setId(item.getId()); - limitList.setProjectId(id); + limitList.setProjectId(bo.getProjectId()); + limitList.setType(bo.getType()); limitList.setUnitPrice(item.getUnitPrice()); busBillofquantities.add(limitList); }); @@ -229,11 +234,19 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl { sids.add(item.getSid()); }); + if (sids.isEmpty()) { + return new ArrayList<>(); + } List listVoList = baseMapper.selectListBySids(sids); return listVoList; } + @Override + public BusBLimitListVersionsVo getVersionDetail(Long id) { + return busBLimitListVersionsService.queryById(id); + } + /** * 递归构建树形结构 * @param parentId 父节点ID（顶级节点为0） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusSegmentedIndicatorPlanningServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusSegmentedIndicatorPlanningServiceImpl.java index 95348b76..b7fa2a94 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusSegmentedIndicatorPlanningServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusSegmentedIndicatorPlanningServiceImpl.java @@ -117,7 +117,7 @@ public class BusSegmentedIndicatorPlanningServiceImpl extends ServiceImpl 0; if (flag) { bo.setId(add.getId()); @@ -155,7 +155,7 @@ public class BusSegmentedIndicatorPlanningServiceImpl extends ServiceImpl 0; } @@ -165,7 +165,7 @@ public class BusSegmentedIndicatorPlanningServiceImpl extends ServiceImpl { if (contractPrice.compareTo(BigDecimal.valueOf(100000000)) > 0) { @@ -238,6 +238,9 @@ public class BusSegmentedIndicatorPlanningServiceImpl extends ServiceImpl billofquantitiesLimitListList = busBillofquantitiesLimitListService.getListByIds(ids); + if (billofquantitiesLimitListList.isEmpty()) { + return billofquantitiesLimitListList; + } List list = billofquantitiesLimitListList.stream().distinct().collect(Collectors.toList()); for (BusBillofquantitiesLimitListVo limitList : list) { for (BusIndicatorPlanningLimitList limitList1 : planningLimitListList) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java index 4f20904f..a70dc182 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java @@ -91,6 +91,7 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl 0; } + @Override + public List getList(TenderSupplierInputBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List tenderSupplierInputVos = baseMapper.selectVoList(lqw); + List list = new ArrayList<>(); + tenderSupplierInputVos.forEach(tenderSupplierInputVo -> { + TenderSupplierInputVo vo = new TenderSupplierInputVo(); + vo.setSupplierName(tenderSupplierInputVo.getSupplierName()); + vo.setId(tenderSupplierInputVo.getId()); + list.add(vo); + }); + return list; + } + /** * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBillofquantitiesLimitListMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBillofquantitiesLimitListMapper.xml index bb871db0..897fada2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBillofquantitiesLimitListMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBillofquantitiesLimitListMapper.xml @@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +