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 615acea9..8d3fae48 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 @@ -77,8 +77,8 @@ public class BusListOfWinningBidsController extends BaseController { @Log(title = "中标项目一览", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@RequestPart("bo") BusListOfWinningBidsBo bo ,@RequestParam(name = "file", required = false) MultipartFile file) { - return toAjax(busListOfWinningBidsService.insertByBo(bo,file)); + 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/domain/BusListOfWinningBids.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/BusListOfWinningBids.java index ed7b21f1..99692db9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/BusListOfWinningBids.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/BusListOfWinningBids.java @@ -136,5 +136,57 @@ public class BusListOfWinningBids extends BaseEntity { */ private String bidFileName; + /** + * 招标代理机构 + */ + private String biddingAgency; + + /** + * 招标人 + */ + private String tenderer; + + /** + * 投标截止时间 + */ + private Date biddingDeadline; + + /** + * 开标时间 + */ + private Date bidOpeningTime; + + /** + * 项目概况 + */ + private String projectOverview; + + /** + * 建设地点 + */ + private String constructionSite; + + /** + * 计划工期 + */ + private String planDuration; + + /** + * 答疑截止时间 + */ + private Date answeringDeadlineTime; + + /** + * 澄清截止时间 + */ + private Date clarifyDeadlineTime; + + /** + * 是否有投标保证金(0有,1无) + */ + private String whetherDeposit; + + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusListOfWinningBidsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusListOfWinningBidsBo.java index 458a6567..2058f811 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusListOfWinningBidsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusListOfWinningBidsBo.java @@ -131,6 +131,7 @@ public class BusListOfWinningBidsBo extends BaseEntity { * 中标通知书 */ private String bidFile; + private Long bidFileId; /** * 中标通知书名称 @@ -139,4 +140,46 @@ public class BusListOfWinningBidsBo extends BaseEntity { + /** + * 招标代理机构 + */ + private String biddingAgency; + /** + * 招标人 + */ + private String tenderer; + /** + * 投标截止时间 + */ + private Date biddingDeadline; + /** + * 开标时间 + */ + private Date bidOpeningTime; + /** + * 项目概况 + */ + private String projectOverview; + /** + * 建设地点 + */ + private String constructionSite; + /** + * 计划工期 + */ + private String planDuration; + /** + * 答疑截止时间 + */ + private Date answeringDeadlineTime; + /** + * 澄清截止时间 + */ + private Date clarifyDeadlineTime; + /** + * 是否有投标保证金(0有,1无) + */ + private String whetherDeposit; + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusListOfWinningBidsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusListOfWinningBidsVo.java index 1cbea85f..e7a8d646 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusListOfWinningBidsVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusListOfWinningBidsVo.java @@ -165,4 +165,56 @@ public class BusListOfWinningBidsVo implements Serializable { private String bidFileName; + + /** + * 招标代理机构 + */ + private String biddingAgency; + + /** + * 招标人 + */ + private String tenderer; + + /** + * 投标截止时间 + */ + private Date biddingDeadline; + + /** + * 开标时间 + */ + private Date bidOpeningTime; + + /** + * 项目概况 + */ + private String projectOverview; + + /** + * 建设地点 + */ + private String constructionSite; + + /** + * 计划工期 + */ + private String planDuration; + + /** + * 答疑截止时间 + */ + private Date answeringDeadlineTime; + + /** + * 澄清截止时间 + */ + private Date clarifyDeadlineTime; + + /** + * 是否有投标保证金(0有,1无) + */ + private String whetherDeposit; + + } 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 af3603cc..48e829d8 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 @@ -7,7 +7,6 @@ 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.springframework.web.multipart.MultipartFile; import java.util.Collection; import java.util.List; @@ -48,11 +47,10 @@ public interface IBusListOfWinningBidsService extends IService 0; if (flag) { bo.setId(add.getId()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java index 2344668f..1de359e8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java @@ -37,6 +37,10 @@ public class CtrIncomeContract extends BaseEntity { * 合同编号 */ private String contractCode; + /** + * 项目名称 + */ + private String contractName; /** * 合同类型 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java index c971c2b1..8480106d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java @@ -39,6 +39,11 @@ public class CtrIncomeContractBo extends BaseEntity { */ private String contractCode; + /** + * 项目名称 + */ + private String contractName; + /** * 合同类型 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java index ee20701d..25a4055f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java @@ -44,6 +44,10 @@ public class CtrIncomeContractVo implements Serializable { @ExcelProperty(value = "项目ID") private Long projectId; + /** + * 项目名称 + */ + private String contractName; /** * 合同编号 */ 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 a80bec35..d32171f5 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 @@ -68,9 +68,9 @@ public class BusTenderPlanLimitListController extends BaseController { * 获取所有版本详细信息 */ @SaCheckPermission("tender:tenderPlanLimitList:getVersionDetail") - @GetMapping("/getVersionDetail/{id}") - public R getVersionDetail(Long id) { - return R.ok(busBillofquantitiesLimitListService.getVersionDetail(id)); + @GetMapping("/getVersionDetail") + public R getVersionDetail(BusBillofquantitiesLimitListBo bo) { + return R.ok(busBillofquantitiesLimitListService.getVersionDetail(bo.getVersions())); } /** 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 2e1dd5bf..287a415e 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 @@ -67,4 +67,6 @@ public interface IBusBLimitListVersionsService extends IService ids, Boolean isValid); + + BusBLimitListVersionsVo queryByVersion(String versions); } 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 70bd1a56..b0365a75 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 @@ -100,8 +100,9 @@ public interface IBusBillofquantitiesLimitListService extends IService 0; } + @Override + public BusBLimitListVersionsVo queryByVersion(String versions) { + BusBLimitListVersions busBLimitListVersions = baseMapper.selectOne(new LambdaQueryWrapper().eq(BusBLimitListVersions::getVersions, versions)); + BusBLimitListVersionsVo vo = BeanUtil.copyProperties(busBLimitListVersions, BusBLimitListVersionsVo.class); + return vo; + } + /** * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等) * 正常使用只需#processEvent.flowCode=='leave1' @@ -147,26 +155,16 @@ public class BusBLimitListVersionsServiceImpl extends ServiceImpl eq = new LambdaQueryWrapper() - .eq(BusBLimitListVersions::getVersions, id); + .eq(BusBLimitListVersions::getVersions, bus); BusBLimitListVersions busBLimitListVersions = new BusBLimitListVersions(); busBLimitListVersions.setStatus(processEvent.getStatus()); -// -// - boolean update = this.update(busBLimitListVersions, eq); -// BusBiddingPlan biddingPlan = baseMapper.selectById(Long.valueOf(id)); -// if (biddingPlan == null) { -// log.error(""); -// } -// if (BusinessStatusEnum.DRAFT.getStatus().equals(biddingPlan.getStatus())) { -// biddingPlan.setBidStatus(1); -// } -// biddingPlan.setStatus(processEvent.getStatus()); -// baseMapper.updateById(biddingPlan); + baseMapper.update(busBLimitListVersions, eq); } /** @@ -179,7 +177,7 @@ public class BusBLimitListVersionsServiceImpl extends ServiceImpl eq = new LambdaQueryWrapper() + .eq(BusBLimitListVersions::getVersions, bus); + BusBLimitListVersions busBLimitListVersions = new BusBLimitListVersions(); + busBLimitListVersions.setStatus(processEvent.getStatus()); + baseMapper.update(busBLimitListVersions, eq); + } + + /** + * 执行任务创建监听 + * 示例:也可通过 @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断 + * 在方法中判断流程节点key + * if ("xxx".equals(processTaskEvent.getNodeCode())) { + * //执行业务逻辑 + * } + * + * @param processTaskEvent 参数 + */ + @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('xianjiayilan')") + public void processTaskPlansHandlerEquipmentList1(ProcessTaskEvent processTaskEvent) { + log.info("物资设备清单审核任务创建了{}", processTaskEvent.toString()); + } + + /** + * 监听删除流程事件 + * 正常使用只需#processDeleteEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processDeleteEvent 参数 + */ + @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('xianjiayilan')") + public void processDeletePlansHandlerEquipmentList1(ProcessDeleteEvent processDeleteEvent) { + log.info("物资设备清单计划删除流程事件,技术标准文件审核任务执行了{}", processDeleteEvent.toString()); + } + + /** + * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等) + * 正常使用只需#processEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processEvent 参数 + */ + @org.springframework.context.event.EventListener(condition = "#processEvent.flowCode.endsWith('wuziyilan')") + public void processPlansHandlErequipmentList2(ProcessEvent processEvent) { + log.info("物资设备清单审核任务执行了{}", processEvent.toString()); + String id = processEvent.getBusinessId(); + String bus = id.split("_")[0]; + LambdaQueryWrapper eq = new LambdaQueryWrapper() + .eq(BusBLimitListVersions::getVersions, bus); + BusBLimitListVersions busBLimitListVersions = new BusBLimitListVersions(); + busBLimitListVersions.setStatus(processEvent.getStatus()); + baseMapper.update(busBLimitListVersions, eq); + } + + /** + * 执行任务创建监听 + * 示例:也可通过 @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断 + * 在方法中判断流程节点key + * if ("xxx".equals(processTaskEvent.getNodeCode())) { + * //执行业务逻辑 + * } + * + * @param processTaskEvent 参数 + */ + @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('wuziyilan')") + public void processTaskPlansHandlerEquipmentList2(ProcessTaskEvent processTaskEvent) { + log.info("物资设备清单审核任务创建了{}", processTaskEvent.toString()); + } + + /** + * 监听删除流程事件 + * 正常使用只需#processDeleteEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processDeleteEvent 参数 + */ + @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('wuziyilan')") + public void processDeletePlansHandlerEquipmentList2(ProcessDeleteEvent processDeleteEvent) { + log.info("物资设备清单计划删除流程事件,技术标准文件审核任务执行了{}", processDeleteEvent.toString()); + } } 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 83c5987f..92ddc781 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 @@ -2,10 +2,6 @@ package org.dromara.tender.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.event.ProcessDeleteEvent; -import org.dromara.common.core.domain.event.ProcessEvent; -import org.dromara.common.core.domain.event.ProcessTaskEvent; -import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -15,15 +11,12 @@ 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.BusBillofquantitiesVersions; -import org.dromara.tender.domain.BusBiddingPlan; 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.context.event.EventListener; import org.springframework.stereotype.Service; import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo; import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo; @@ -252,8 +245,8 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl