From 2b99eb8d768f3af68ec82456e51d2a82c4bfbd60 Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 21 Aug 2025 15:46:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectBigScreenController.java | 13 +++++++++++++ .../CtrExpensesContractController.java | 18 ++++++++++++++++++ .../ctr/domain/CtrExpensesContract.java | 5 +++++ .../ctr/domain/bo/CtrExpensesContractBo.java | 5 +++++ .../ctr/domain/vo/CtrExpensesContractVo.java | 5 +++++ .../impl/CtrExpensesContractServiceImpl.java | 3 ++- .../controller/DesExtractController.java | 14 ++++++++++++++ 7 files changed, 62 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java index a712a43d..13731344 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java @@ -1,6 +1,12 @@ package org.dromara.bigscreen.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.core.domain.R; +import org.dromara.tender.domain.vo.BusBiddingPlanAnnexVo; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,4 +18,11 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/project/big/screen") public class ProjectBigScreenController { + + +// @GetMapping("/{projectId}") +// public R getInfo(@NotNull(message = "主键不能为空") +// @PathVariable Long id) { +// return R.ok(busBiddingPlanAnnexService.queryById(id)); +// } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrExpensesContractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrExpensesContractController.java index 93be0b4d..fc4c3c0a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrExpensesContractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrExpensesContractController.java @@ -9,6 +9,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.ctr.domain.bo.CtrFileBo; import org.dromara.ctr.domain.vo.CtrFileVo; import org.dromara.ctr.service.ICtrFileService; +import org.dromara.tender.domain.bo.BusBiddingPlanBo; +import org.dromara.tender.domain.vo.BusBiddingPlanVo; +import org.dromara.tender.service.IBusBiddingPlanService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -41,6 +44,8 @@ public class CtrExpensesContractController extends BaseController { private final ICtrFileService fileService; + private final IBusBiddingPlanService biddingPlanService; + /** * 查询支出合同列表 */ @@ -116,4 +121,17 @@ public class CtrExpensesContractController extends BaseController { public TableDataInfo list(CtrFileBo bo, PageQuery pageQuery) { return fileService.queryPageList(bo, pageQuery); } + + + /** + * 招标计划选择列表 + */ + @SaCheckPermission("ctr:expensesContract:add") + @GetMapping("/tender/list") + public R> list(BusBiddingPlanBo bo) { + return R.ok(biddingPlanService.queryList(bo)); + } + + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java index 7814aa10..22f47a89 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java @@ -53,6 +53,11 @@ public class CtrExpensesContract extends BaseEntity { */ private String contractedContent; + /** + * 分包名称 + */ + private String contractName; + /** * 合同金额 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java index 4a7386b7..7e736291 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java @@ -54,6 +54,11 @@ public class CtrExpensesContractBo extends BaseEntity { */ private String contractedContent; + /** + * 分包名称 + */ + private String contractName; + /** * 合同金额 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java index c423c129..ffffc603 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java @@ -74,6 +74,11 @@ public class CtrExpensesContractVo implements Serializable { @ExcelProperty(value = "分包内容") private String contractedContent; + /** + * 分包名称 + */ + private String contractName; + /** * 合同金额 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrExpensesContractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrExpensesContractServiceImpl.java index bb508b2b..5c09c4bd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrExpensesContractServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/service/impl/CtrExpensesContractServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.ctr.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -100,7 +101,7 @@ public class CtrExpensesContractServiceImpl extends ServiceImpl 0; - if(!bo.getFileList().isEmpty()){ + if(CollectionUtil.isNotEmpty(bo.getFileList())){ List convert = MapstructUtils.convert(bo.getFileList(), CtrFile.class); convert.forEach(item -> item.setContractId(add.getId())); fileService.saveBatch(convert); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesExtractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesExtractController.java index edd1f0a5..e1e21564 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesExtractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesExtractController.java @@ -7,9 +7,12 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.design.domain.bo.DesCollectFileBo; +import org.dromara.design.domain.bo.DesUserBo; import org.dromara.design.domain.dto.desCollect.DesCollectBatchDto; import org.dromara.design.domain.dto.desExtract.DesExtractBatchDto; import org.dromara.design.domain.vo.DesCollectFileVo; +import org.dromara.design.domain.vo.DesUserVo; +import org.dromara.design.service.IDesUserService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -40,6 +43,7 @@ public class DesExtractController extends BaseController { private final IDesExtractService desExtractService; + private final IDesUserService deUserService; /** * 查询提资清单列表 */ @@ -116,6 +120,16 @@ public class DesExtractController extends BaseController { return R.ok(desExtractService.batchAddOrUpdate(dto)); } + /** + * 查询用户的专业 + */ + @SaCheckPermission("design:extract:add") + @GetMapping("/userMajor") + public R> selectUserMajor(DesUserBo bo) { + return R.ok( deUserService.queryList(bo)); + } + + /** * 清单导出 */