diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusSegmentedIndicatorPlanningController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusSegmentedIndicatorPlanningController.java index 3331802a..f2ccc265 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusSegmentedIndicatorPlanningController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusSegmentedIndicatorPlanningController.java @@ -92,8 +92,8 @@ public class BusSegmentedIndicatorPlanningController extends BaseController { public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { BusSegmentedIndicatorPlanningVo busSegmentedIndicatorPlanningVo = busSegmentedIndicatorPlanningService.queryById(id); - List list = tenderPlanFileService.list(Wrappers.lambdaQuery().eq(TenderPlanFile::getPlanId, id)); - busSegmentedIndicatorPlanningVo.setFile(list); +// List list = tenderPlanFileService.list(Wrappers.lambdaQuery().eq(TenderPlanFile::getPlanId, id)); +// busSegmentedIndicatorPlanningVo.setFile(list); return R.ok(busSegmentedIndicatorPlanningVo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderPlanController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderPlanController.java index 47a0bf5a..d1e748c4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderPlanController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderPlanController.java @@ -101,15 +101,14 @@ public class TenderPlanController extends BaseController { @RepeatSubmit() @PutMapping() public R edit(@RequestBody BusSegmentedIndicatorPlanningBo bo) { - - if (CollectionUtil.isNotEmpty(bo.getFile())) { - tenderPlanFileService.remove(Wrappers.lambdaQuery().eq(TenderPlanFile::getPlanId, bo.getId())); - List convert = MapstructUtils.convert(bo.getFile(), TenderPlanFile.class); - convert.forEach(item -> { - item.setPlanId(bo.getId()); - }); - tenderPlanFileService.saveBatch(convert); - } +// tenderPlanFileService.remove(Wrappers.lambdaQuery().eq(TenderPlanFile::getPlanId, bo.getId())); +// if (CollectionUtil.isNotEmpty(bo.getFile())) { +// List convert = MapstructUtils.convert(bo.getFile(), TenderPlanFile.class); +// convert.forEach(item -> { +// item.setPlanId(bo.getId()); +// }); +// tenderPlanFileService.saveBatch(convert); +// } // if (files != null && !files.isEmpty()) { // List tenderPlanFiles = new ArrayList<>(); // for (MultipartFile file : files) { 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 a7f66243..d1ce26ca 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 @@ -83,4 +83,7 @@ public class BusSegmentedIndicatorPlanning extends BaseEntity { */ private String bidFile; + + private String tenderFile; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusSegmentedIndicatorPlanningBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusSegmentedIndicatorPlanningBo.java index 0aee5c1c..893d4b5f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusSegmentedIndicatorPlanningBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusSegmentedIndicatorPlanningBo.java @@ -100,4 +100,7 @@ public class BusSegmentedIndicatorPlanningBo extends BaseEntity { */ private List file; + + private String tenderFile; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java index e0df46f4..5ff11e27 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java @@ -119,7 +119,7 @@ public class TenderSupplierInputBo extends BaseEntity { /** * 证书有效期 */ - private String safeCertificateValidity; + private Date safeCertificateValidity; /** * 注册注册人员的数量 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusSegmentedIndicatorPlanningVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusSegmentedIndicatorPlanningVo.java index 75a19982..c763c381 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusSegmentedIndicatorPlanningVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusSegmentedIndicatorPlanningVo.java @@ -102,6 +102,8 @@ BusSegmentedIndicatorPlanningVo implements Serializable { @ExcelProperty(value = "中标通知书") private String bidFile; - private List file; +// private List file; + + private String tenderFile; } 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 d24ab49a..95348b76 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 @@ -165,7 +165,7 @@ public class BusSegmentedIndicatorPlanningServiceImpl extends ServiceImpl { if (contractPrice.compareTo(BigDecimal.valueOf(100000000)) > 0) {