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 80f55675..f0c71fb3 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 @@ -107,8 +107,8 @@ public class BusBiddingLimitListController extends BaseController { @Log(title = "成本-投标", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/importExcelFile") - public R importExcelFile(Long projectId, @RequestParam("file") MultipartFile file) { - return toAjax(busBiddingLimitListService.importExcelFile(projectId, file)); + public R importExcelFile(BusBiddingLimitListBo bo, @RequestParam("file") MultipartFile file) { + return toAjax(busBiddingLimitListService.importExcelFile(bo, file)); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitListVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitListVo.java index 40721d50..2e528b2d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitListVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitListVo.java @@ -1,5 +1,6 @@ package org.dromara.bidding.domain.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import org.dromara.bidding.domain.BusBiddingLimitList; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -77,6 +78,7 @@ public class BusBiddingLimitListVo implements Serializable { * 名称 */ @ExcelProperty(value = "名称") + @ColumnWidth(50) private String name; /** 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 ef4746ab..34c49d14 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 @@ -79,7 +79,7 @@ public interface IBusBiddingLimitListService extends IService getTree(BusBiddingLimitListBo bo); - Boolean importExcelFile(Long projectId, MultipartFile file); + Boolean importExcelFile(BusBiddingLimitListBo projectId, MultipartFile file); List obtainAllVersionNumbers(BiddingAllVersionNumbersReq 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 index cf81c621..ae59d413 100644 --- 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 @@ -71,4 +71,6 @@ public interface IBusBiddingLimitVersionsService extends IService ids, Boolean isValid); BusBiddingLimitVersions queryByProjectId( String versions, Long projectId); + + BusBiddingLimitVersions getByProjectIdVersions(Long projectId, String versions); } 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 921b0804..b4abd712 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 @@ -25,8 +25,6 @@ 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.BusBillofquantitiesLimitList; -import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -239,7 +237,15 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl dataList = null; @@ -271,7 +277,6 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl() + .eq(BusBiddingLimitVersions::getProjectId, projectId) + .eq(BusBiddingLimitVersions::getVersions, versions)); + } + /** * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等) 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 96d577a5..6d34236d 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 @@ -1,5 +1,6 @@ package org.dromara.tender.domain.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import org.dromara.design.domain.vo.ObtainTheListRes; import org.dromara.tender.domain.BusBillofquantitiesLimitList; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; @@ -82,6 +83,7 @@ public class BusBillofquantitiesLimitListVo implements Serializable { /** * 名称 */ + @ColumnWidth(50) @ExcelProperty(value = "名称") private String name; 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 index 287a415e..975b1a63 100644 --- 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 @@ -1,5 +1,7 @@ package org.dromara.tender.service; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import org.dromara.tender.domain.vo.BusBLimitListVersionsVo; import org.dromara.tender.domain.bo.BusBLimitListVersionsBo; import org.dromara.tender.domain.BusBLimitListVersions; @@ -69,4 +71,6 @@ public interface IBusBLimitListVersionsService extends IService ids, Boolean isValid); BusBLimitListVersionsVo queryByVersion(String versions); + + BusBLimitListVersions getByProjectIdVersions( Long projectId, String versions); } 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 index c5360f9b..ffbf0817 100644 --- 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 @@ -148,6 +148,13 @@ public class BusBLimitListVersionsServiceImpl extends ServiceImpl() + .eq(BusBLimitListVersions::getProjectId, projectId) + .eq(BusBLimitListVersions::getVersions, versions)); + } + /** * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等) * 正常使用只需#processEvent.flowCode=='leave1' 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 cb0f3fb2..7426804d 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,17 +1,21 @@ package org.dromara.tender.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; 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.BusBLimitListVersions; import org.dromara.tender.domain.BusBillofquantitiesLimitList; import org.dromara.tender.domain.bo.BusBLimitListVersionsBo; import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo; @@ -238,7 +242,13 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl dataList = ExcelDynamicReader.readExcel( @@ -262,6 +272,9 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl