From fa9fcb11673e42992cc85c7856ce3bbf1bb4111c Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 28 Nov 2025 11:32:35 +0800 Subject: [PATCH 01/12] bug --- .../quality/controller/QltQualityInspectionController.java | 6 +++--- .../service/impl/QltQualityInspectionServiceImpl.java | 3 ++- .../safety/controller/HseSafetyInspectionController.java | 6 +++--- .../safety/service/impl/HseSafetyInspectionServiceImpl.java | 2 ++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java index b71d4db4..eb1113ad 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java @@ -60,7 +60,7 @@ public class QltQualityInspectionController extends BaseController { /** * 查询质量-检查工单列表 */ - @SaCheckPermission("quality:qualityInspection:list") + @SaCheckPermission(value = {"quality:qualityInspection:list","quality:subQualityInspection:list"}, mode = SaMode.OR) @GetMapping("/list") public TableDataInfo list(QltQualityInspectionQueryReq req, PageQuery pageQuery) { return qualityInspectionService.queryPageList(req, pageQuery); @@ -101,7 +101,7 @@ public class QltQualityInspectionController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("quality:qualityInspection:query") +// @SaCheckPermission("quality:qualityInspection:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -122,7 +122,7 @@ public class QltQualityInspectionController extends BaseController { /** * 修改质量-检查工单 */ - @SaCheckPermission("quality:qualityInspection:edit") + @SaCheckPermission(value = {"quality:qualityInspection:edit","quality:subQualityInspection:edit"}, mode = SaMode.OR) @Log(title = "质量-检查工单", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java index 65a4a8fd..b65dc0ac 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java @@ -22,6 +22,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.exception.OssException; import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.utils.DocumentUtil; import org.dromara.project.service.IBusProjectService; import org.dromara.quality.constant.QltQualityConstant; @@ -364,7 +365,7 @@ public class QltQualityInspectionServiceImpl extends ServiceImpl list(HseSafetyInspectionQueryReq req, PageQuery pageQuery) { return safetyInspectionService.queryPageListWeb(req, pageQuery); @@ -74,7 +74,7 @@ public class HseSafetyInspectionController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("safety:safetyInspection:query") +// @SaCheckPermission("safety:safetyInspection:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -117,7 +117,7 @@ public class HseSafetyInspectionController extends BaseController { /** * 修改安全巡检工单 */ - @SaCheckPermission("safety:safetyInspection:edit") + @SaCheckPermission(value = {"\"safety:safetyInspection:edit", "safety:subSafetyInspection:edit"}, mode = SaMode.OR) @Log(title = "安全巡检工单", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java index 440fade3..4cd589f9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java @@ -392,6 +392,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl Date: Fri, 28 Nov 2025 15:22:39 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=A0=87=E5=89=8D=E7=AB=8B=E9=A1=B9bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/QuerBiddingManagementDto.java | 5 +++++ .../biaoqianlixiang/XzdBidPreProjectMapper.xml | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/dto/QuerBiddingManagementDto.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/dto/QuerBiddingManagementDto.java index c4289e75..e113f80e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/dto/QuerBiddingManagementDto.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/dto/QuerBiddingManagementDto.java @@ -48,5 +48,10 @@ public class QuerBiddingManagementDto { private Integer num; + /** + * 审核状态 + */ + private String auditStatus; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/biddingManagement/biaoqianlixiang/XzdBidPreProjectMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/biddingManagement/biaoqianlixiang/XzdBidPreProjectMapper.xml index a73aeb75..c65e6e8a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/biddingManagement/biaoqianlixiang/XzdBidPreProjectMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/biddingManagement/biaoqianlixiang/XzdBidPreProjectMapper.xml @@ -87,6 +87,9 @@ xzd_bid_pre_project a LEFT JOIN xzd_bqlx_project_info b ON a.id = b.bid_pre_project_id + + AND a.audit_status = #{bo.auditStatus} + AND a.project_number = #{bo.projectNumber} @@ -128,6 +131,9 @@ xzd_bid_pre_project a LEFT JOIN xzd_bqlx_project_info b ON a.id = b.bid_pre_project_id + + AND a.audit_status = #{bo.auditStatus} + AND a.project_number = #{bo.projectNumber} From d37b41c967d89661a7683b819e220e3d45f6103b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Fri, 28 Nov 2025 16:05:21 +0800 Subject: [PATCH 03/12] =?UTF-8?q?11-28-=E8=AF=A6=E6=83=85=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XzdGuaranteeChangeInfoController.java | 41 ++++++++-------- .../XzdGuaranteeInfoController.java | 36 +++++++------- .../XzdDepositApplicationController.java | 36 +++++++------- .../controller/XzdFbhtzbjthController.java | 47 ++++++++++--------- 4 files changed, 81 insertions(+), 79 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java index 150e2fed..c0bf96c0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java @@ -1,30 +1,31 @@ package org.dromara.xzd.deposit.backletter.controller; -import java.util.List; - -import cn.dev33.satoken.annotation.SaMode; -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.xzd.deposit.contractBackletter.domain.bo.XzdGuaranteeInfoBo; -import org.dromara.xzd.deposit.contractBackletter.domain.vo.XzdGuaranteeInfoVo; -import org.dromara.xzd.deposit.contractBackletter.service.IXzdGuaranteeInfoService; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import cn.dev33.satoken.annotation.SaMode; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.xzd.deposit.backletter.domain.vo.XzdGuaranteeChangeInfoVo; -import org.dromara.xzd.deposit.backletter.domain.bo.XzdGuaranteeChangeInfoBo; -import org.dromara.xzd.deposit.backletter.service.IXzdGuaranteeChangeInfoService; +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.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.xzd.deposit.backletter.domain.bo.XzdGuaranteeChangeInfoBo; +import org.dromara.xzd.deposit.backletter.domain.vo.XzdGuaranteeChangeInfoVo; +import org.dromara.xzd.deposit.backletter.service.IXzdGuaranteeChangeInfoService; +import org.dromara.xzd.deposit.contractBackletter.domain.bo.XzdGuaranteeInfoBo; +import org.dromara.xzd.deposit.contractBackletter.domain.vo.XzdGuaranteeInfoVo; +import org.dromara.xzd.deposit.contractBackletter.service.IXzdGuaranteeInfoService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 承包合同保函变更 @@ -67,7 +68,7 @@ public class XzdGuaranteeChangeInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("backletter:guaranteeChangeInfo:query") +// @SaCheckPermission("backletter:guaranteeChangeInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java index 011c2e55..201b315e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java @@ -1,31 +1,31 @@ package org.dromara.xzd.deposit.contractBackletter.controller; -import java.util.List; - -import cn.dev33.satoken.annotation.SaMode; -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +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.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; import org.dromara.xzd.deposit.contractBackletter.domain.bo.XzdGuaranteeInfoBo; import org.dromara.xzd.deposit.contractBackletter.domain.vo.XzdGuaranteeInfoVo; import org.dromara.xzd.deposit.contractBackletter.service.IXzdGuaranteeInfoService; import org.dromara.xzd.domain.bo.XzdContractDetailsBo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.service.IXzdContractDetailsService; -import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; +import org.springframework.web.bind.annotation.*; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import java.util.List; /** * 承包合同保函 @@ -68,7 +68,7 @@ public class XzdGuaranteeInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("deposit:guaranteeInfo:query") +// @SaCheckPermission("deposit:guaranteeInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java index 36cdca2a..d06ea354 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java @@ -1,31 +1,31 @@ package org.dromara.xzd.deposit.earnestMoney.controller; -import java.util.List; - -import cn.dev33.satoken.annotation.SaMode; -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +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.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.dto.QuerBiddingManagementDto; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QueryListXzdVo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService; import org.dromara.xzd.deposit.earnestMoney.domain.bo.XzdDepositApplicationBo; import org.dromara.xzd.deposit.earnestMoney.domain.vo.XzdDepositApplicationVo; import org.dromara.xzd.deposit.earnestMoney.service.IXzdDepositApplicationService; -import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; +import org.springframework.web.bind.annotation.*; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import java.util.List; /** * 保证金缴纳审批 @@ -68,7 +68,7 @@ public class XzdDepositApplicationController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("earnestMoney:depositApplication:query") +// @SaCheckPermission("earnestMoney:depositApplication:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java index 016aced3..e601253c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java @@ -1,33 +1,34 @@ package org.dromara.xzd.deposit.refundDeposit.controller; -import java.util.List; - -import cn.dev33.satoken.annotation.SaMode; -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.bo.XzdSubcontractBo; -import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; -import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService; -import org.dromara.xzd.settlement.fenbaohetongjungong.domain.bo.SettlementOfSubcontractingCompletionBo; -import org.dromara.xzd.settlement.fenbaohetongjungong.domain.vo.SettlementOfSubcontractingCompletionVo; -import org.dromara.xzd.settlement.fenbaohetongjungong.service.ISettlementOfSubcontractingCompletionService; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import cn.dev33.satoken.annotation.SaMode; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.xzd.deposit.refundDeposit.domain.vo.XzdFbhtzbjthVo; -import org.dromara.xzd.deposit.refundDeposit.domain.bo.XzdFbhtzbjthBo; -import org.dromara.xzd.deposit.refundDeposit.service.IXzdFbhtzbjthService; +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.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.bo.XzdSubcontractBo; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService; +import org.dromara.xzd.deposit.refundDeposit.domain.bo.XzdFbhtzbjthBo; +import org.dromara.xzd.deposit.refundDeposit.domain.vo.XzdFbhtzbjthVo; +import org.dromara.xzd.deposit.refundDeposit.service.IXzdFbhtzbjthService; +import org.dromara.xzd.settlement.fenbaohetongjungong.domain.bo.SettlementOfSubcontractingCompletionBo; +import org.dromara.xzd.settlement.fenbaohetongjungong.domain.vo.SettlementOfSubcontractingCompletionVo; +import org.dromara.xzd.settlement.fenbaohetongjungong.service.ISettlementOfSubcontractingCompletionService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 分包合同质保金退还 @@ -94,7 +95,7 @@ public class XzdFbhtzbjthController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("refundDeposit:fbhtzbjth:query") +// @SaCheckPermission("refundDeposit:fbhtzbjth:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { From 4f38db5fdeaeaf38792d345a1dfac8d26c6eac31 Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 28 Nov 2025 18:56:59 +0800 Subject: [PATCH 04/12] bug --- .../java/org/dromara/out/controller/OutMonthPlanController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutMonthPlanController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutMonthPlanController.java index 89dc0821..e987ff27 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutMonthPlanController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutMonthPlanController.java @@ -133,7 +133,7 @@ public class OutMonthPlanController extends BaseController { /** * 获取该月份3种类型计划产值 */ - @SaCheckPermission("out:monthPlan:monthInfo") +// @SaCheckPermission("out:monthPlan:monthInfo") @GetMapping("/monthInfo/{id}") public R> infoByPlanMonth(@NotNull(message = "主键不能为空") @PathVariable Long id) { From 492fba5fd3331c0ec6e6a61db4929efb6178814e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Fri, 28 Nov 2025 19:55:29 +0800 Subject: [PATCH 05/12] =?UTF-8?q?11-28-=E8=AF=A6=E6=83=85=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppreciationInvoiceController.java | 43 ++++++++++--------- .../controller/XzdSpykpKpsqController.java | 2 +- .../controller/XzdSpykpSjsqdController.java | 2 +- .../controller/XzdSpykpSpdjController.java | 2 +- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java index a0d6ec31..a1ea1abd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java @@ -1,33 +1,34 @@ package org.dromara.xzd.fapiaotaizhang.zengzhishui.controller; -import java.util.List; - -import cn.dev33.satoken.annotation.SaMode; -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.xzd.domain.bo.XzdContractDetailsBo; -import org.dromara.xzd.domain.vo.XzdContractDetailsVo; -import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.vo.XzdXhqdVo; -import org.dromara.xzd.service.IXzdContractDetailsService; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import cn.dev33.satoken.annotation.SaMode; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.vo.AppreciationInvoiceVo; -import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.bo.AppreciationInvoiceBo; -import org.dromara.xzd.fapiaotaizhang.zengzhishui.service.IAppreciationInvoiceService; +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.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.bo.AppreciationInvoiceBo; +import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.vo.AppreciationInvoiceVo; +import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.vo.XzdXhqdVo; +import org.dromara.xzd.fapiaotaizhang.zengzhishui.service.IAppreciationInvoiceService; +import org.dromara.xzd.service.IXzdContractDetailsService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.List; + /** * 增值税发票 * @@ -69,7 +70,7 @@ public class AppreciationInvoiceController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("zengzhishui:invoice:query") +// @SaCheckPermission("zengzhishui:invoice:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/controller/XzdSpykpKpsqController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/controller/XzdSpykpKpsqController.java index 3bcdbc6b..8b51474f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/controller/XzdSpykpKpsqController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/controller/XzdSpykpKpsqController.java @@ -71,7 +71,7 @@ public class XzdSpykpKpsqController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("kpsq:kpsq:query") +// @SaCheckPermission("kpsq:kpsq:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/controller/XzdSpykpSjsqdController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/controller/XzdSpykpSjsqdController.java index 9b843ed2..2561b538 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/controller/XzdSpykpSjsqdController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/controller/XzdSpykpSjsqdController.java @@ -87,7 +87,7 @@ public class XzdSpykpSjsqdController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("sjsqd:sjsqd:query") +// @SaCheckPermission("sjsqd:sjsqd:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/controller/XzdSpykpSpdjController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/controller/XzdSpykpSpdjController.java index 12385d38..0df5bc61 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/controller/XzdSpykpSpdjController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/controller/XzdSpykpSpdjController.java @@ -62,7 +62,7 @@ public class XzdSpykpSpdjController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("spdj:spdj:query") +// @SaCheckPermission("spdj:spdj:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { From f782edd68bd9ba0b74067031bd96a2e27bfb9bab Mon Sep 17 00:00:00 2001 From: zt Date: Tue, 2 Dec 2025 16:24:02 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/design/controller/DesSchemeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesSchemeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesSchemeController.java index bd2ecab0..e3d52082 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesSchemeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesSchemeController.java @@ -63,7 +63,7 @@ public class DesSchemeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("design:scheme:query") +// @SaCheckPermission("design:scheme:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { From e972efb24791bd3fbfaa98aa2a81187deca98841 Mon Sep 17 00:00:00 2001 From: zt Date: Tue, 2 Dec 2025 16:24:39 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/design/controller/DesPrelimSchemeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesPrelimSchemeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesPrelimSchemeController.java index f609d0de..6dc039d8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesPrelimSchemeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesPrelimSchemeController.java @@ -63,7 +63,7 @@ public class DesPrelimSchemeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("design:prelimScheme:query") +// @SaCheckPermission("design:prelimScheme:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { From c96808efc17cd0ad0dde754d3c7592bcd7644384 Mon Sep 17 00:00:00 2001 From: zt Date: Tue, 2 Dec 2025 17:42:35 +0800 Subject: [PATCH 08/12] bug --- .../contractor/controller/SubConstructionUserController.java | 2 +- .../design/service/impl/DesVolumeCatalogServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java index 063db64e..f6a3c963 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java @@ -271,7 +271,7 @@ public class SubConstructionUserController extends BaseController { /** * 查询项目班组列表 contractor:constructionUser:newUserList */ - @SaCheckPermission(value = {"project:projectTeam:addTeam", "contractor:constructionUser:newUserList"}, mode = SaMode.OR) + @SaCheckPermission(value = {"project:projectTeam:addTeam", "contractor:constructionUser:newUserList","contractor:constructionUser:addTeam"}, mode = SaMode.OR) @GetMapping("/projectList") public TableDataInfo list(BusProjectQueryReq req, PageQuery pageQuery) { return projectService.queryPageList(req, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java index f1a03153..84c20eb3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java @@ -393,7 +393,7 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl Date: Thu, 4 Dec 2025 15:12:56 +0800 Subject: [PATCH 09/12] =?UTF-8?q?12-04-=E6=94=B6=E7=A5=A8=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spdj/service/impl/XzdSpykpSpdjServiceImpl.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java index a8567b7f..10144231 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java @@ -274,20 +274,12 @@ public class XzdSpykpSpdjServiceImpl extends ServiceImpl byid2 = iXzdCorrespondentList.getCustomerByid(vo.getXfId()); -// if (byid2 != null) { -// if (byid2.getData().getXzdCustomerinformation() != null) { -// vo.setXfmc(byid2.getData().getXzdCustomerinformation().getUnitName()); -// } -// } -// } + //经办人 if (vo.getJbrId() != null){ SysUserVo sysUserVo = sysUserService.selectUserById(vo.getJbrId()); if (sysUserVo != null){ - vo.setJbrmc(sysUserVo.getUserName()); + vo.setJbrmc(sysUserVo.getNickName()); } } //记账组织 From 833ea7af7d53e1e8100aa7b544e972f72ce349ca Mon Sep 17 00:00:00 2001 From: xiaozhou <536509503@qq.com> Date: Tue, 9 Dec 2025 14:33:49 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=A0=87=E5=89=8D=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=BB=BB=E5=91=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biaoqianlixiang/domain/XzdFxxxb.java | 66 +++++++ .../biaoqianlixiang/domain/bo/XzdFxxxbBo.java | 67 ++++++++ .../domain/bo/XzdProjectRiskAssessmentBo.java | 9 + .../biaoqianlixiang/domain/vo/XzdFxxxbVo.java | 80 +++++++++ .../domain/vo/XzdProjectRiskAssessmentVo.java | 8 + .../mapper/XzdFxxxbMapper.java | 15 ++ .../service/IXzdFxxxbService.java | 70 ++++++++ .../service/impl/XzdFxxxbServiceImpl.java | 136 +++++++++++++++ .../XzdProjectRiskAssessmentServiceImpl.java | 18 +- .../controller/XzdBqglRyrmController.java | 105 ++++++++++++ .../ryrm/domain/XzdBqglRyrm.java | 57 ++++++ .../ryrm/domain/XzdBqglRyrmRmxx.java | 46 +++++ .../ryrm/domain/bo/XzdBqglRyrmBo.java | 64 +++++++ .../ryrm/domain/bo/XzdBqglRyrmRmxxBo.java | 48 ++++++ .../ryrm/domain/vo/XzdBqglRyrmRmxxVo.java | 65 +++++++ .../ryrm/domain/vo/XzdBqglRyrmVo.java | 72 ++++++++ .../ryrm/mapper/XzdBqglRyrmMapper.java | 15 ++ .../ryrm/mapper/XzdBqglRyrmRmxxMapper.java | 15 ++ .../ryrm/service/IXzdBqglRyrmRmxxService.java | 70 ++++++++ .../ryrm/service/IXzdBqglRyrmService.java | 70 ++++++++ .../impl/XzdBqglRyrmRmxxServiceImpl.java | 133 ++++++++++++++ .../service/impl/XzdBqglRyrmServiceImpl.java | 162 ++++++++++++++++++ 22 files changed, 1390 insertions(+), 1 deletion(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdFxxxb.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdFxxxbBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdFxxxbVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/mapper/XzdFxxxbMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/IXzdFxxxbService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdFxxxbServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrmRmxx.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmRmxxBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmRmxxVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/mapper/XzdBqglRyrmMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/mapper/XzdBqglRyrmRmxxMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/IXzdBqglRyrmRmxxService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/IXzdBqglRyrmService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmRmxxServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdFxxxb.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdFxxxb.java new file mode 100644 index 00000000..48bf43a4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdFxxxb.java @@ -0,0 +1,66 @@ +package org.dromara.xzd.biddingManagement.biaoqianlixiang.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 项目风险评估-风险信息对象 xzd_fxxxb + * + * @author Lion Li + * @date 2025-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("xzd_fxxxb") +public class XzdFxxxb extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 主表id + */ + private Long masterId; + + /** + * 风险名称 + */ + private String riskName; + + /** + * 风险等级 + */ + private String riskLevel; + + /** + * 风险详细描述 + */ + private String riskDesc; + + /** + * 影响程度 + */ + private String impactDegree; + + /** + * 发生概率 + */ + private String occurProbability; + + /** + * 风险应对措施 + */ + private String responseMeasures; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdFxxxbBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdFxxxbBo.java new file mode 100644 index 00000000..cfde66b3 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdFxxxbBo.java @@ -0,0 +1,67 @@ +package org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo; + +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdFxxxb; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 项目风险评估-风险信息业务对象 xzd_fxxxb + * + * @author Lion Li + * @date 2025-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = XzdFxxxb.class, reverseConvertGenerate = false) +public class XzdFxxxbBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 主表id + */ + private Long masterId; + + /** + * 风险名称 + */ + @NotBlank(message = "风险名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String riskName; + + /** + * 风险等级 + */ + @NotBlank(message = "风险等级不能为空", groups = { AddGroup.class, EditGroup.class }) + private String riskLevel; + + /** + * 风险详细描述 + */ + private String riskDesc; + + /** + * 影响程度 + */ + private String impactDegree; + + /** + * 发生概率 + */ + private String occurProbability; + + /** + * 风险应对措施 + */ + private String responseMeasures; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdProjectRiskAssessmentBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdProjectRiskAssessmentBo.java index 52c281f4..934d6eb5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdProjectRiskAssessmentBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdProjectRiskAssessmentBo.java @@ -7,8 +7,11 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdFxxxb; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdProjectRiskAssessment; +import java.util.List; + /** * 项目风险评估签审意见业务对象 xzd_project_risk_assessment * @@ -119,4 +122,10 @@ public class XzdProjectRiskAssessmentBo extends BaseEntity { private String auditStatus; + /** + * 风险信息对象 + */ + private List fxxxbList; + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdFxxxbVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdFxxxbVo.java new file mode 100644 index 00000000..4c9861cf --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdFxxxbVo.java @@ -0,0 +1,80 @@ +package org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo; + +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdFxxxb; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 项目风险评估-风险信息视图对象 xzd_fxxxb + * + * @author Lion Li + * @date 2025-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = XzdFxxxb.class) +public class XzdFxxxbVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 主表id + */ + @ExcelProperty(value = "主表id") + private Long masterId; + + /** + * 风险名称 + */ + @ExcelProperty(value = "风险名称") + private String riskName; + + /** + * 风险等级 + */ + @ExcelProperty(value = "风险等级") + private String riskLevel; + + /** + * 风险详细描述 + */ + @ExcelProperty(value = "风险详细描述") + private String riskDesc; + + /** + * 影响程度 + */ + @ExcelProperty(value = "影响程度") + private String impactDegree; + + /** + * 发生概率 + */ + @ExcelProperty(value = "发生概率") + private String occurProbability; + + /** + * 风险应对措施 + */ + @ExcelProperty(value = "风险应对措施") + private String responseMeasures; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdProjectRiskAssessmentVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdProjectRiskAssessmentVo.java index d3f5f8e8..35d4ef96 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdProjectRiskAssessmentVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdProjectRiskAssessmentVo.java @@ -8,11 +8,13 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdFxxxb; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdProjectRiskAssessment; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; /** @@ -169,4 +171,10 @@ public class XzdProjectRiskAssessmentVo implements Serializable { @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy") private String createByName; + + /** + * 风险信息对象 + */ + private List fxxxbList; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/mapper/XzdFxxxbMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/mapper/XzdFxxxbMapper.java new file mode 100644 index 00000000..60bf575a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/mapper/XzdFxxxbMapper.java @@ -0,0 +1,15 @@ +package org.dromara.xzd.biddingManagement.biaoqianlixiang.mapper; + +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdFxxxb; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdFxxxbVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 项目风险评估-风险信息Mapper接口 + * + * @author Lion Li + * @date 2025-12-09 + */ +public interface XzdFxxxbMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/IXzdFxxxbService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/IXzdFxxxbService.java new file mode 100644 index 00000000..6cae7191 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/IXzdFxxxbService.java @@ -0,0 +1,70 @@ +package org.dromara.xzd.biddingManagement.biaoqianlixiang.service; + +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdFxxxbVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo.XzdFxxxbBo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdFxxxb; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 项目风险评估-风险信息Service接口 + * + * @author Lion Li + * @date 2025-12-09 + */ +public interface IXzdFxxxbService extends IService{ + + /** + * 查询项目风险评估-风险信息 + * + * @param id 主键 + * @return 项目风险评估-风险信息 + */ + XzdFxxxbVo queryById(Long id); + + /** + * 分页查询项目风险评估-风险信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 项目风险评估-风险信息分页列表 + */ + TableDataInfo queryPageList(XzdFxxxbBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的项目风险评估-风险信息列表 + * + * @param bo 查询条件 + * @return 项目风险评估-风险信息列表 + */ + List queryList(XzdFxxxbBo bo); + + /** + * 新增项目风险评估-风险信息 + * + * @param bo 项目风险评估-风险信息 + * @return 是否新增成功 + */ + Boolean insertByBo(XzdFxxxbBo bo); + + /** + * 修改项目风险评估-风险信息 + * + * @param bo 项目风险评估-风险信息 + * @return 是否修改成功 + */ + Boolean updateByBo(XzdFxxxbBo bo); + + /** + * 校验并批量删除项目风险评估-风险信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdFxxxbServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdFxxxbServiceImpl.java new file mode 100644 index 00000000..7e486c40 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdFxxxbServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.xzd.biddingManagement.biaoqianlixiang.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo.XzdFxxxbBo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdFxxxbVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdFxxxb; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.mapper.XzdFxxxbMapper; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdFxxxbService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 项目风险评估-风险信息Service业务层处理 + * + * @author Lion Li + * @date 2025-12-09 + */ +@RequiredArgsConstructor +@Service +public class XzdFxxxbServiceImpl extends ServiceImpl implements IXzdFxxxbService { + + private final XzdFxxxbMapper baseMapper; + + /** + * 查询项目风险评估-风险信息 + * + * @param id 主键 + * @return 项目风险评估-风险信息 + */ + @Override + public XzdFxxxbVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询项目风险评估-风险信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 项目风险评估-风险信息分页列表 + */ + @Override + public TableDataInfo queryPageList(XzdFxxxbBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的项目风险评估-风险信息列表 + * + * @param bo 查询条件 + * @return 项目风险评估-风险信息列表 + */ + @Override + public List queryList(XzdFxxxbBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(XzdFxxxbBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(XzdFxxxb::getId); + lqw.like(StringUtils.isNotBlank(bo.getRiskName()), XzdFxxxb::getRiskName, bo.getRiskName()); + lqw.eq(StringUtils.isNotBlank(bo.getRiskLevel()), XzdFxxxb::getRiskLevel, bo.getRiskLevel()); + lqw.eq(StringUtils.isNotBlank(bo.getRiskDesc()), XzdFxxxb::getRiskDesc, bo.getRiskDesc()); + lqw.eq(StringUtils.isNotBlank(bo.getImpactDegree()), XzdFxxxb::getImpactDegree, bo.getImpactDegree()); + lqw.eq(StringUtils.isNotBlank(bo.getOccurProbability()), XzdFxxxb::getOccurProbability, bo.getOccurProbability()); + lqw.eq(StringUtils.isNotBlank(bo.getResponseMeasures()), XzdFxxxb::getResponseMeasures, bo.getResponseMeasures()); + return lqw; + } + + /** + * 新增项目风险评估-风险信息 + * + * @param bo 项目风险评估-风险信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(XzdFxxxbBo bo) { + XzdFxxxb add = MapstructUtils.convert(bo, XzdFxxxb.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改项目风险评估-风险信息 + * + * @param bo 项目风险评估-风险信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(XzdFxxxbBo bo) { + XzdFxxxb update = MapstructUtils.convert(bo, XzdFxxxb.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(XzdFxxxb entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除项目风险评估-风险信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdProjectRiskAssessmentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdProjectRiskAssessmentServiceImpl.java index 31f5926a..b576a466 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdProjectRiskAssessmentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdProjectRiskAssessmentServiceImpl.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdFxxxb; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdProjectRiskAssessment; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo.XzdProjectRiskAssessmentBo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QuerListXzdBidPreVo; @@ -23,6 +24,7 @@ import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdProjectByV import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdProjectRiskAssessmentVo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.mapper.XzdProjectRiskAssessmentMapper; import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdFxxxbService; import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdProjectRiskAssessmentService; import org.dromara.xzd.comprehensive.domain.XzdCsContractInformation; import org.dromara.xzd.utilS.AreaUtil; @@ -54,6 +56,8 @@ public class XzdProjectRiskAssessmentServiceImpl extends ServiceImpl xzdFxxxbs = fxxxbService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdFxxxb::getMasterId, vo.getId())); + vo.setFxxxbList(xzdFxxxbs); } @@ -167,6 +173,10 @@ public class XzdProjectRiskAssessmentServiceImpl extends ServiceImpl 0; + if (bo.getFxxxbList() != null && bo.getFxxxbList().size() > 0){ + bo.getFxxxbList().forEach(temp -> temp.setMasterId(add.getId())); + fxxxbService.saveBatch(bo.getFxxxbList()); + } if (flag) { bo.setId(add.getId()); } @@ -183,6 +193,12 @@ public class XzdProjectRiskAssessmentServiceImpl extends ServiceImpl().eq(XzdFxxxb::getMasterId, update.getId())); + if (bo.getFxxxbList() != null && bo.getFxxxbList().size() > 0){ + bo.getFxxxbList().forEach(temp -> temp.setMasterId(update.getId())); + fxxxbService.saveBatch(bo.getFxxxbList()); + } return baseMapper.updateById(update) > 0; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java new file mode 100644 index 00000000..c3c44912 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java @@ -0,0 +1,105 @@ +package org.dromara.xzd.biddingManagement.ryrm.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmVo; +import org.dromara.xzd.biddingManagement.ryrm.domain.bo.XzdBqglRyrmBo; +import org.dromara.xzd.biddingManagement.ryrm.service.IXzdBqglRyrmService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 标前管理-人员任命 + * + * @author Lion Li + * @date 2025-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/ryrm/bqglRyrm") +public class XzdBqglRyrmController extends BaseController { + + private final IXzdBqglRyrmService xzdBqglRyrmService; + + /** + * 查询标前管理-人员任命列表 + */ + @SaCheckPermission("ryrm:bqglRyrm:list") + @GetMapping("/list") + public TableDataInfo list(XzdBqglRyrmBo bo, PageQuery pageQuery) { + return xzdBqglRyrmService.queryPageList(bo, pageQuery); + } + + /** + * 导出标前管理-人员任命列表 + */ + @SaCheckPermission("ryrm:bqglRyrm:export") + @Log(title = "标前管理-人员任命", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(XzdBqglRyrmBo bo, HttpServletResponse response) { + List list = xzdBqglRyrmService.queryList(bo); + ExcelUtil.exportExcel(list, "标前管理-人员任命", XzdBqglRyrmVo.class, response); + } + + /** + * 获取标前管理-人员任命详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("ryrm:bqglRyrm:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdBqglRyrmService.queryById(id)); + } + + /** + * 新增标前管理-人员任命 + */ + @SaCheckPermission("ryrm:bqglRyrm:add") + @Log(title = "标前管理-人员任命", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody XzdBqglRyrmBo bo) { + return toAjax(xzdBqglRyrmService.insertByBo(bo)); + } + + /** + * 修改标前管理-人员任命 + */ + @SaCheckPermission("ryrm:bqglRyrm:edit") + @Log(title = "标前管理-人员任命", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody XzdBqglRyrmBo bo) { + return toAjax(xzdBqglRyrmService.updateByBo(bo)); + } + + /** + * 删除标前管理-人员任命 + * + * @param ids 主键串 + */ + @SaCheckPermission("ryrm:bqglRyrm:remove") + @Log(title = "标前管理-人员任命", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(xzdBqglRyrmService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java new file mode 100644 index 00000000..a63712c1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java @@ -0,0 +1,57 @@ +package org.dromara.xzd.biddingManagement.ryrm.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.time.LocalDate; + +/** + * 标前管理-人员任命对象 xzd_bqgl_ryrm + * + * @author Lion Li + * @date 2025-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("xzd_bqgl_ryrm") +public class XzdBqglRyrm extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 主表id(标前立项) + */ + private Long masterId; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 项目编码 + */ + private String projectNumber; + + /** + * 项目类型 + */ + private Long projectTypeId; + + /** + * 单据日期 + */ + private LocalDate billDate; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrmRmxx.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrmRmxx.java new file mode 100644 index 00000000..e2f5e892 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrmRmxx.java @@ -0,0 +1,46 @@ +package org.dromara.xzd.biddingManagement.ryrm.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 标前管理-人员任命-任命信息对象 xzd_bqgl_ryrm_rmxx + * + * @author Lion Li + * @date 2025-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("xzd_bqgl_ryrm_rmxx") +public class XzdBqglRyrmRmxx extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 主表id(风险信息表) + */ + private Long masterId; + + /** + * 角色 + */ + private String jsId; + + /** + * 用户id + */ + private Long userId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java new file mode 100644 index 00000000..257a0b75 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java @@ -0,0 +1,64 @@ +package org.dromara.xzd.biddingManagement.ryrm.domain.bo; + +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrm; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; + +import java.time.LocalDate; +import java.util.List; + +/** + * 标前管理-人员任命业务对象 xzd_bqgl_ryrm + * + * @author Lion Li + * @date 2025-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = XzdBqglRyrm.class, reverseConvertGenerate = false) +public class XzdBqglRyrmBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 主表id(标前立项) + */ + @NotNull(message = "主表id(标前立项)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long masterId; + + /** + * 项目名称 + */ + @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectName; + + /** + * 项目编码 + */ + @NotBlank(message = "项目编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectNumber; + + /** + * 项目类型 + */ + @NotNull(message = "项目类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long projectTypeId; + + /** + * 单据日期 + */ + private LocalDate billDate; + + private List rmxxBoList; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmRmxxBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmRmxxBo.java new file mode 100644 index 00000000..e6cc45ca --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmRmxxBo.java @@ -0,0 +1,48 @@ +package org.dromara.xzd.biddingManagement.ryrm.domain.bo; + +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 标前管理-人员任命-任命信息业务对象 xzd_bqgl_ryrm_rmxx + * + * @author Lion Li + * @date 2025-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = XzdBqglRyrmRmxx.class, reverseConvertGenerate = false) +public class XzdBqglRyrmRmxxBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 主表id(风险信息表) + */ + @NotNull(message = "主表id(风险信息表)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long masterId; + + /** + * 角色 + */ + @NotBlank(message = "角色不能为空", groups = { AddGroup.class, EditGroup.class }) + private String jsId; + + /** + * 用户id + */ + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmRmxxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmRmxxVo.java new file mode 100644 index 00000000..50039e85 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmRmxxVo.java @@ -0,0 +1,65 @@ +package org.dromara.xzd.biddingManagement.ryrm.domain.vo; + +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 标前管理-人员任命-任命信息视图对象 xzd_bqgl_ryrm_rmxx + * + * @author Lion Li + * @date 2025-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = XzdBqglRyrmRmxx.class) +public class XzdBqglRyrmRmxxVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 主表id(风险信息表) + */ + @ExcelProperty(value = "主表id(风险信息表)") + private Long masterId; + + /** + * 角色 + */ + @ExcelProperty(value = "角色") + private String jsId; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + + /** + * 用户名 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "userId") + private Long userName; + + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java new file mode 100644 index 00000000..cbad93ee --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java @@ -0,0 +1,72 @@ +package org.dromara.xzd.biddingManagement.ryrm.domain.vo; + +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrm; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDate; +import java.util.Date; +import java.util.List; + + +/** + * 标前管理-人员任命视图对象 xzd_bqgl_ryrm + * + * @author Lion Li + * @date 2025-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = XzdBqglRyrm.class) +public class XzdBqglRyrmVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 主表id(标前立项) + */ + @ExcelProperty(value = "主表id(标前立项)") + private Long masterId; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + + /** + * 项目编码 + */ + @ExcelProperty(value = "项目编码") + private String projectNumber; + + /** + * 项目类型 + */ + @ExcelProperty(value = "项目类型") + private Long projectTypeId; + + /** + * 单据日期 + */ + @ExcelProperty(value = "单据日期") + private LocalDate billDate; + + private List rmxxBoList; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/mapper/XzdBqglRyrmMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/mapper/XzdBqglRyrmMapper.java new file mode 100644 index 00000000..763b0b81 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/mapper/XzdBqglRyrmMapper.java @@ -0,0 +1,15 @@ +package org.dromara.xzd.biddingManagement.ryrm.mapper; + +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrm; +import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 标前管理-人员任命Mapper接口 + * + * @author Lion Li + * @date 2025-12-09 + */ +public interface XzdBqglRyrmMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/mapper/XzdBqglRyrmRmxxMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/mapper/XzdBqglRyrmRmxxMapper.java new file mode 100644 index 00000000..646f7708 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/mapper/XzdBqglRyrmRmxxMapper.java @@ -0,0 +1,15 @@ +package org.dromara.xzd.biddingManagement.ryrm.mapper; + +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; +import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmRmxxVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 标前管理-人员任命-任命信息Mapper接口 + * + * @author Lion Li + * @date 2025-12-09 + */ +public interface XzdBqglRyrmRmxxMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/IXzdBqglRyrmRmxxService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/IXzdBqglRyrmRmxxService.java new file mode 100644 index 00000000..221e05e5 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/IXzdBqglRyrmRmxxService.java @@ -0,0 +1,70 @@ +package org.dromara.xzd.biddingManagement.ryrm.service; + +import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmRmxxVo; +import org.dromara.xzd.biddingManagement.ryrm.domain.bo.XzdBqglRyrmRmxxBo; +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 标前管理-人员任命-任命信息Service接口 + * + * @author Lion Li + * @date 2025-12-09 + */ +public interface IXzdBqglRyrmRmxxService extends IService{ + + /** + * 查询标前管理-人员任命-任命信息 + * + * @param id 主键 + * @return 标前管理-人员任命-任命信息 + */ + XzdBqglRyrmRmxxVo queryById(Long id); + + /** + * 分页查询标前管理-人员任命-任命信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 标前管理-人员任命-任命信息分页列表 + */ + TableDataInfo queryPageList(XzdBqglRyrmRmxxBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的标前管理-人员任命-任命信息列表 + * + * @param bo 查询条件 + * @return 标前管理-人员任命-任命信息列表 + */ + List queryList(XzdBqglRyrmRmxxBo bo); + + /** + * 新增标前管理-人员任命-任命信息 + * + * @param bo 标前管理-人员任命-任命信息 + * @return 是否新增成功 + */ + Boolean insertByBo(XzdBqglRyrmRmxxBo bo); + + /** + * 修改标前管理-人员任命-任命信息 + * + * @param bo 标前管理-人员任命-任命信息 + * @return 是否修改成功 + */ + Boolean updateByBo(XzdBqglRyrmRmxxBo bo); + + /** + * 校验并批量删除标前管理-人员任命-任命信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/IXzdBqglRyrmService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/IXzdBqglRyrmService.java new file mode 100644 index 00000000..951278c4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/IXzdBqglRyrmService.java @@ -0,0 +1,70 @@ +package org.dromara.xzd.biddingManagement.ryrm.service; + +import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmVo; +import org.dromara.xzd.biddingManagement.ryrm.domain.bo.XzdBqglRyrmBo; +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrm; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 标前管理-人员任命Service接口 + * + * @author Lion Li + * @date 2025-12-09 + */ +public interface IXzdBqglRyrmService extends IService{ + + /** + * 查询标前管理-人员任命 + * + * @param id 主键 + * @return 标前管理-人员任命 + */ + XzdBqglRyrmVo queryById(Long id); + + /** + * 分页查询标前管理-人员任命列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 标前管理-人员任命分页列表 + */ + TableDataInfo queryPageList(XzdBqglRyrmBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的标前管理-人员任命列表 + * + * @param bo 查询条件 + * @return 标前管理-人员任命列表 + */ + List queryList(XzdBqglRyrmBo bo); + + /** + * 新增标前管理-人员任命 + * + * @param bo 标前管理-人员任命 + * @return 是否新增成功 + */ + Boolean insertByBo(XzdBqglRyrmBo bo); + + /** + * 修改标前管理-人员任命 + * + * @param bo 标前管理-人员任命 + * @return 是否修改成功 + */ + Boolean updateByBo(XzdBqglRyrmBo bo); + + /** + * 校验并批量删除标前管理-人员任命信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmRmxxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmRmxxServiceImpl.java new file mode 100644 index 00000000..533245bc --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmRmxxServiceImpl.java @@ -0,0 +1,133 @@ +package org.dromara.xzd.biddingManagement.ryrm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.xzd.biddingManagement.ryrm.domain.bo.XzdBqglRyrmRmxxBo; +import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmRmxxVo; +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; +import org.dromara.xzd.biddingManagement.ryrm.mapper.XzdBqglRyrmRmxxMapper; +import org.dromara.xzd.biddingManagement.ryrm.service.IXzdBqglRyrmRmxxService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 标前管理-人员任命-任命信息Service业务层处理 + * + * @author Lion Li + * @date 2025-12-09 + */ +@RequiredArgsConstructor +@Service +public class XzdBqglRyrmRmxxServiceImpl extends ServiceImpl implements IXzdBqglRyrmRmxxService { + + private final XzdBqglRyrmRmxxMapper baseMapper; + + /** + * 查询标前管理-人员任命-任命信息 + * + * @param id 主键 + * @return 标前管理-人员任命-任命信息 + */ + @Override + public XzdBqglRyrmRmxxVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询标前管理-人员任命-任命信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 标前管理-人员任命-任命信息分页列表 + */ + @Override + public TableDataInfo queryPageList(XzdBqglRyrmRmxxBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的标前管理-人员任命-任命信息列表 + * + * @param bo 查询条件 + * @return 标前管理-人员任命-任命信息列表 + */ + @Override + public List queryList(XzdBqglRyrmRmxxBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(XzdBqglRyrmRmxxBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(XzdBqglRyrmRmxx::getId); + lqw.eq(bo.getMasterId() != null, XzdBqglRyrmRmxx::getMasterId, bo.getMasterId()); + lqw.eq(StringUtils.isNotBlank(bo.getJsId()), XzdBqglRyrmRmxx::getJsId, bo.getJsId()); + lqw.eq(bo.getUserId() != null, XzdBqglRyrmRmxx::getUserId, bo.getUserId()); + return lqw; + } + + /** + * 新增标前管理-人员任命-任命信息 + * + * @param bo 标前管理-人员任命-任命信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(XzdBqglRyrmRmxxBo bo) { + XzdBqglRyrmRmxx add = MapstructUtils.convert(bo, XzdBqglRyrmRmxx.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改标前管理-人员任命-任命信息 + * + * @param bo 标前管理-人员任命-任命信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(XzdBqglRyrmRmxxBo bo) { + XzdBqglRyrmRmxx update = MapstructUtils.convert(bo, XzdBqglRyrmRmxx.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(XzdBqglRyrmRmxx entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除标前管理-人员任命-任命信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java new file mode 100644 index 00000000..17d86c1f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java @@ -0,0 +1,162 @@ +package org.dromara.xzd.biddingManagement.ryrm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; +import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmRmxxVo; +import org.dromara.xzd.biddingManagement.ryrm.service.IXzdBqglRyrmRmxxService; +import org.springframework.stereotype.Service; +import org.dromara.xzd.biddingManagement.ryrm.domain.bo.XzdBqglRyrmBo; +import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmVo; +import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrm; +import org.dromara.xzd.biddingManagement.ryrm.mapper.XzdBqglRyrmMapper; +import org.dromara.xzd.biddingManagement.ryrm.service.IXzdBqglRyrmService; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 标前管理-人员任命Service业务层处理 + * + * @author Lion Li + * @date 2025-12-09 + */ +@RequiredArgsConstructor +@Service +public class XzdBqglRyrmServiceImpl extends ServiceImpl implements IXzdBqglRyrmService { + + private final XzdBqglRyrmMapper baseMapper; + + private final IXzdBqglRyrmRmxxService xzdBqglRyrmRmxxService; + + /** + * 查询标前管理-人员任命 + * + * @param id 主键 + * @return 标前管理-人员任命 + */ + @Override + public XzdBqglRyrmVo queryById(Long id){ + XzdBqglRyrmVo xzdBqglRyrmVo = baseMapper.selectVoById(id); + saveValue(xzdBqglRyrmVo); + return xzdBqglRyrmVo; + } + + private void saveValue(XzdBqglRyrmVo xzdBqglRyrmVo) { + if (xzdBqglRyrmVo != null){ + List xzdBqglRyrmRmxxes = xzdBqglRyrmRmxxService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdBqglRyrmRmxx::getMasterId, xzdBqglRyrmVo.getId())); + xzdBqglRyrmVo.setRmxxBoList(MapstructUtils.convert(xzdBqglRyrmRmxxes, XzdBqglRyrmRmxxVo.class)); + + } + } + + /** + * 分页查询标前管理-人员任命列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 标前管理-人员任命分页列表 + */ + @Override + public TableDataInfo queryPageList(XzdBqglRyrmBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的标前管理-人员任命列表 + * + * @param bo 查询条件 + * @return 标前管理-人员任命列表 + */ + @Override + public List queryList(XzdBqglRyrmBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(XzdBqglRyrmBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(XzdBqglRyrm::getId); + lqw.eq(bo.getMasterId() != null, XzdBqglRyrm::getMasterId, bo.getMasterId()); + lqw.like(StringUtils.isNotBlank(bo.getProjectName()), XzdBqglRyrm::getProjectName, bo.getProjectName()); + lqw.eq(StringUtils.isNotBlank(bo.getProjectNumber()), XzdBqglRyrm::getProjectNumber, bo.getProjectNumber()); + lqw.eq(bo.getProjectTypeId() != null, XzdBqglRyrm::getProjectTypeId, bo.getProjectTypeId()); + lqw.eq(bo.getBillDate() != null, XzdBqglRyrm::getBillDate, bo.getBillDate()); + return lqw; + } + + /** + * 新增标前管理-人员任命 + * + * @param bo 标前管理-人员任命 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(XzdBqglRyrmBo bo) { + XzdBqglRyrm add = MapstructUtils.convert(bo, XzdBqglRyrm.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (bo.getRmxxBoList() != null && bo.getRmxxBoList().size() > 0){ + bo.getRmxxBoList().forEach(rmxxBo -> rmxxBo.setMasterId(add.getId())); + xzdBqglRyrmRmxxService.saveBatch(bo.getRmxxBoList()); + } + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改标前管理-人员任命 + * + * @param bo 标前管理-人员任命 + * @return 是否修改成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(XzdBqglRyrmBo bo) { + XzdBqglRyrm update = MapstructUtils.convert(bo, XzdBqglRyrm.class); + validEntityBeforeSave(update); + xzdBqglRyrmRmxxService.getBaseMapper().delete(new LambdaQueryWrapper().eq(XzdBqglRyrmRmxx::getMasterId, update.getId())); + if (bo.getRmxxBoList() != null && bo.getRmxxBoList().size() > 0){ + bo.getRmxxBoList().forEach(rmxxBo -> rmxxBo.setMasterId(bo.getId())); + xzdBqglRyrmRmxxService.saveBatch(bo.getRmxxBoList()); + } + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(XzdBqglRyrm entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除标前管理-人员任命信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} From 509fc8cc28e2f45783bd9b528e97927b4d8a0151 Mon Sep 17 00:00:00 2001 From: xiaozhou <536509503@qq.com> Date: Tue, 9 Dec 2025 18:59:18 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=A0=87=E5=89=8D=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=BB=BB=E5=91=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ryrm/controller/XzdBqglRyrmController.java | 18 ++++++++++++++++++ .../ryrm/domain/XzdBqglRyrm.java | 5 +++++ .../ryrm/domain/bo/XzdBqglRyrmBo.java | 5 ++++- .../ryrm/domain/vo/XzdBqglRyrmVo.java | 10 ++++++++++ .../service/impl/XzdBqglRyrmServiceImpl.java | 14 ++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java index c3c44912..8520f1b4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.biddingManagement.ryrm.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.dto.QuerBiddingManagementDto; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QueryListXzdVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,20 @@ public class XzdBqglRyrmController extends BaseController { private final IXzdBqglRyrmService xzdBqglRyrmService; + private final IXzdBidPreProjectService xzdBidPreProjectService; + + + + /** + * 查询标前立项列表 + */ + @SaCheckPermission(value = {"ryrm:bqglRyrm:list","ryrm:bqglRyrm:add","ryrm:bqglRyrm:edit"},mode = SaMode.OR) + @GetMapping("/getlist") + public QueryListXzdVo list(QuerBiddingManagementDto bo, PageQuery pageQuery) { + return xzdBidPreProjectService.queryPageList(bo, pageQuery); + } + + /** * 查询标前管理-人员任命列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java index a63712c1..2c144eec 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java @@ -43,6 +43,11 @@ public class XzdBqglRyrm extends BaseEntity { */ private String projectNumber; + /** + * 人员编码 + */ + private String ryNumber; + /** * 项目类型 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java index 257a0b75..db067d4d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java @@ -47,7 +47,10 @@ public class XzdBqglRyrmBo extends BaseEntity { */ @NotBlank(message = "项目编码不能为空", groups = { AddGroup.class, EditGroup.class }) private String projectNumber; - + /** + * 人员编码 + */ + private String ryNumber; /** * 项目类型 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java index cbad93ee..9e379549 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java @@ -42,6 +42,11 @@ public class XzdBqglRyrmVo implements Serializable { @ExcelProperty(value = "主表id(标前立项)") private Long masterId; + /** + * 人员编码 + */ + private String ryNumber; + /** * 项目名称 */ @@ -59,6 +64,11 @@ public class XzdBqglRyrmVo implements Serializable { */ @ExcelProperty(value = "项目类型") private Long projectTypeId; + /** + * 项目类型 + */ + @ExcelProperty(value = "项目类型") + private String projectTypeName; /** * 单据日期 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java index 17d86c1f..8f8952bc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java @@ -9,9 +9,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmRmxxVo; import org.dromara.xzd.biddingManagement.ryrm.service.IXzdBqglRyrmRmxxService; +import org.dromara.xzd.domain.vo.XzdProjectTypeVo; +import org.dromara.xzd.service.IXzdProjectTypeService; import org.springframework.stereotype.Service; import org.dromara.xzd.biddingManagement.ryrm.domain.bo.XzdBqglRyrmBo; import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmVo; @@ -37,6 +40,7 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl xzdBqglRyrmRmxxes = xzdBqglRyrmRmxxService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdBqglRyrmRmxx::getMasterId, xzdBqglRyrmVo.getId())); xzdBqglRyrmVo.setRmxxBoList(MapstructUtils.convert(xzdBqglRyrmRmxxes, XzdBqglRyrmRmxxVo.class)); + if (xzdBqglRyrmVo.getProjectTypeId() != null){ + XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(xzdBqglRyrmVo.getProjectTypeId()); + if (xzdProjectTypeVo != null){ + xzdBqglRyrmVo.setProjectTypeName(xzdProjectTypeVo.getTypeName()); + } + } } } @@ -70,6 +80,7 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl queryPageList(XzdBqglRyrmBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::saveValue); return TableDataInfo.build(result); } @@ -92,6 +103,7 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl 0; if (bo.getRmxxBoList() != null && bo.getRmxxBoList().size() > 0){ bo.getRmxxBoList().forEach(rmxxBo -> rmxxBo.setMasterId(add.getId())); From c709e04c88d8fd9b903038f3ed274c513801054d Mon Sep 17 00:00:00 2001 From: xiaozhou <536509503@qq.com> Date: Tue, 9 Dec 2025 19:31:55 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=A0=87=E5=89=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BB=BB=E5=91=BD=E6=B7=BB=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java | 5 +++++ .../biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java | 7 +++++++ .../biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java index 2c144eec..29f785c8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java @@ -38,6 +38,11 @@ public class XzdBqglRyrm extends BaseEntity { */ private String projectName; + /** + * 审核状态 + */ + private String auditStatus; + /** * 项目编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java index db067d4d..650f9cad 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java @@ -51,6 +51,13 @@ public class XzdBqglRyrmBo extends BaseEntity { * 人员编码 */ private String ryNumber; + + /** + * 审核状态 + */ + private String auditStatus; + + /** * 项目类型 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java index 9e379549..83883f3c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java @@ -64,6 +64,11 @@ public class XzdBqglRyrmVo implements Serializable { */ @ExcelProperty(value = "项目类型") private Long projectTypeId; + + /** + * 审核状态 + */ + private String auditStatus; /** * 项目类型 */