diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/controller/XzdBxBxsqController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/controller/XzdBxBxsqController.java index 73af9edf..6b7f2db4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/controller/XzdBxBxsqController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/controller/XzdBxBxsqController.java @@ -18,6 +18,12 @@ import org.dromara.common.web.core.BaseController; import org.dromara.xzd.bx.bxsq.domain.bo.XzdBxBxsqBo; import org.dromara.xzd.bx.bxsq.domain.vo.XzdBxBxsqVo; import org.dromara.xzd.bx.bxsq.service.IXzdBxBxsqService; +import org.dromara.xzd.domain.bo.XzdProjectBo; +import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo; +import org.dromara.xzd.domain.vo.XzdProjectVo; +import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo; +import org.dromara.xzd.service.IXzdProjectService; +import org.dromara.xzd.service.IXzdSupplierOpenBankService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,6 +42,8 @@ import java.util.List; public class XzdBxBxsqController extends BaseController { private final IXzdBxBxsqService xzdBxBxsqService; + private final IXzdProjectService xzdProjectService; + private final IXzdSupplierOpenBankService xzdSupplierOpenBankService; /** * 查询报销-报销申请列表 @@ -103,4 +111,23 @@ public class XzdBxBxsqController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdBxBxsqService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询项目信息列表 + */ + @SaCheckPermission("bxsq:bxsq:list || bxsq:bxsq:add || bxsq:bxsq:edit") + @GetMapping("/projectList") + public TableDataInfo list(XzdProjectBo bo, PageQuery pageQuery) { + return xzdProjectService.queryPageList(bo, pageQuery); + } + + /** + * 查询供应商信息-开户银行列表 + */ + @SaCheckPermission("bxsq:bxsq:list || bxsq:bxsq:add || bxsq:bxsq:edit") + @GetMapping("/bankList") + public TableDataInfo list(XzdSupplierOpenBankBo bo, PageQuery pageQuery) { + return xzdSupplierOpenBankService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java index e31bb246..fac94736 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java @@ -1,31 +1,35 @@ package org.dromara.xzd.comprehensive.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.comprehensive.domain.bo.XzdCsContractInformationBo; -import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; -import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; -import org.springframework.context.annotation.Lazy; -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.comprehensive.domain.vo.XzdCsContractChangeVo; -import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractChangeBo; -import org.dromara.xzd.comprehensive.service.IXzdCsContractChangeService; +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.comprehensive.domain.bo.XzdCsContractChangeBo; +import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractInformationBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractChangeVo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractChangeService; +import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 综合服务合同变更 @@ -40,6 +44,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdCsContractChangeController extends BaseController { private final IXzdCsContractChangeService xzdCsContractChangeService; + private final IXzdBusinessSealService xzdBusinessSealService; @Lazy private final IXzdCsContractInformationService xzdCsContractInformationService; @@ -119,4 +124,14 @@ public class XzdCsContractChangeController extends BaseController { public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { return xzdCsContractInformationService.queryPageList(bo, pageQuery); } + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"comprehensive:csContractChange:add","comprehensive:csContractChange:edit","comprehensive:csContractChange:list"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java index 5a3bcdef..6d4afb53 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java @@ -1,31 +1,35 @@ package org.dromara.xzd.comprehensive.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.comprehensive.domain.bo.XzdCsContractInformationBo; -import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; -import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; -import org.springframework.context.annotation.Lazy; -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.comprehensive.domain.vo.XzdCsContractSuspendVo; -import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractSuspendBo; -import org.dromara.xzd.comprehensive.service.IXzdCsContractSuspendService; +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.comprehensive.domain.bo.XzdCsContractInformationBo; +import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractSuspendBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractSuspendVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; +import org.dromara.xzd.comprehensive.service.IXzdCsContractSuspendService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 综合服务合同终止 @@ -40,6 +44,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdCsContractSuspendController extends BaseController { private final IXzdCsContractSuspendService xzdCsContractSuspendService; + private final IXzdBusinessSealService xzdBusinessSealService; + @Lazy private final IXzdCsContractInformationService xzdCsContractInformationService; @@ -119,4 +125,14 @@ public class XzdCsContractSuspendController extends BaseController { public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { return xzdCsContractInformationService.queryPageList(bo, pageQuery); } + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"comprehensive:csContractSuspend:add","comprehensive:csContractSuspend:edit","comprehensive:csContractSuspend:list"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractAccountController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractAccountController.java index dc886874..d45d8445 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractAccountController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractAccountController.java @@ -1,6 +1,7 @@ package org.dromara.xzd.controller; 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; @@ -112,7 +113,7 @@ public class XzdContractAccountController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission("xzd:contractAccount:add || xzd:contractAccount:edit || xzd:contractAccount:list") + @SaCheckPermission(value = {"xzd:contractAccount:add","xzd:contractAccount:edit","xzd:contractAccount:list"}, mode = SaMode.OR) @GetMapping("/detailsList") public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { return xzdContractDetailsService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractChangeController.java index 15d77a5b..5c656513 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractChangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractChangeController.java @@ -1,6 +1,7 @@ package org.dromara.xzd.controller; 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; @@ -15,10 +16,13 @@ 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.XzdBusinessSealBo; import org.dromara.xzd.domain.bo.XzdContractChangeBo; import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.domain.vo.XzdContractChangeVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.dromara.xzd.service.IXzdContractChangeService; import org.dromara.xzd.service.IXzdContractDetailsService; import org.springframework.validation.annotation.Validated; @@ -40,6 +44,7 @@ public class XzdContractChangeController extends BaseController { private final IXzdContractChangeService xzdContractChangeService; private final IXzdContractDetailsService xzdContractDetailsService; + private final IXzdBusinessSealService xzdBusinessSealService; /** * 查询承包合同变更列表 @@ -111,10 +116,19 @@ public class XzdContractChangeController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission("xzd:contractChange:add || xzd:contractChange:edit || xzd:contractChange:list") + @SaCheckPermission(value = {"xzd:contractChange:add","xzd:contractChange:edit","xzd:contractChange:list"}, mode = SaMode.OR) @GetMapping("/detailsList") public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { return xzdContractDetailsService.queryPageList(bo, pageQuery); } + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"xzd:contractChange:add","xzd:contractChange:edit","xzd:contractChange:list"}, mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractDetailsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractDetailsController.java index 3f3abfbb..05ea0a29 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractDetailsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractDetailsController.java @@ -1,26 +1,36 @@ package org.dromara.xzd.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 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.domain.vo.XzdContractDetailsVo; -import org.dromara.xzd.domain.bo.XzdContractDetailsBo; -import org.dromara.xzd.service.IXzdContractDetailsService; +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.XzdBusinessSealBo; +import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.bo.XzdProjectBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.domain.vo.XzdProjectTypeVo; +import org.dromara.xzd.domain.vo.XzdProjectVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.dromara.xzd.service.IXzdContractDetailsService; +import org.dromara.xzd.service.IXzdProjectService; +import org.dromara.xzd.service.IXzdProjectTypeService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 承包合同信息 @@ -35,6 +45,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdContractDetailsController extends BaseController { private final IXzdContractDetailsService xzdContractDetailsService; + private final IXzdProjectService xzdProjectService; + private final IXzdBusinessSealService xzdBusinessSealService; + private final IXzdProjectTypeService xzdProjectTypeService; /** * 查询承包合同信息列表 @@ -102,4 +115,47 @@ public class XzdContractDetailsController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdContractDetailsService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询项目信息列表 + */ + @SaCheckPermission(value = {"xzd:contractDetails:add", "xzd:contractDetails:edit", "xzd:contractDetails:list"}, mode = SaMode.OR) + @GetMapping("/projectList") + public TableDataInfo list(XzdProjectBo bo, PageQuery pageQuery) { + return xzdProjectService.queryPageList(bo, pageQuery); + } + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"xzd:contractDetails:add", "xzd:contractDetails:edit", "xzd:contractDetails:list"}, mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + + /** + * 获取项目信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"xzd:contractDetails:add", "xzd:contractDetails:edit", "xzd:contractDetails:list"}, mode = SaMode.OR) + @GetMapping("/getProjectInfo/{id}") + public R getProjectInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdProjectService.queryById(id)); + } + + /** + * 获取项目大类 + * @param id + * @return + */ + @SaCheckPermission(value = {"xzd:contractDetails:add", "xzd:contractDetails:edit", "xzd:contractDetails:list"}, mode = SaMode.OR) + @GetMapping("/getBigType/{id}") + public R getBigType(@PathVariable Long id) { + return R.ok(xzdProjectTypeService.getBigType(id)); + } + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractProgressSettlementController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractProgressSettlementController.java index 4efc2de1..06b9c37c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractProgressSettlementController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractProgressSettlementController.java @@ -1,6 +1,7 @@ package org.dromara.xzd.controller; 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; @@ -15,10 +16,13 @@ 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.XzdBusinessSealBo; import org.dromara.xzd.domain.bo.XzdContractDetailsBo; import org.dromara.xzd.domain.bo.XzdContractProgressSettlementBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractProgressSettlementVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.dromara.xzd.service.IXzdContractDetailsService; import org.dromara.xzd.service.IXzdContractProgressSettlementService; import org.springframework.validation.annotation.Validated; @@ -40,6 +44,7 @@ public class XzdContractProgressSettlementController extends BaseController { private final IXzdContractProgressSettlementService xzdContractProgressSettlementService; private final IXzdContractDetailsService xzdContractDetailsService; + private final IXzdBusinessSealService xzdBusinessSealService; /** @@ -112,10 +117,19 @@ public class XzdContractProgressSettlementController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission("xzd:contractProgressSettlement:add || xzd:contractProgressSettlement:edit || xzd:contractProgressSettlement:list") + @SaCheckPermission(value = {"xzd:contractProgressSettlement:add", "xzd:contractProgressSettlement:edit", "xzd:contractProgressSettlement:list"}, mode = SaMode.OR) @GetMapping("/detailsList") public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { return xzdContractDetailsService.queryPageList(bo, pageQuery); } + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"xzd:contractProgressSettlement:add", "xzd:contractProgressSettlement:edit", "xzd:contractProgressSettlement:list"}, mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractTerminationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractTerminationController.java index 0af2b39d..11264bd1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractTerminationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractTerminationController.java @@ -1,6 +1,7 @@ package org.dromara.xzd.controller; 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; @@ -15,10 +16,13 @@ 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.XzdBusinessSealBo; import org.dromara.xzd.domain.bo.XzdContractDetailsBo; import org.dromara.xzd.domain.bo.XzdContractTerminationBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractTerminationVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.dromara.xzd.service.IXzdContractDetailsService; import org.dromara.xzd.service.IXzdContractTerminationService; import org.springframework.validation.annotation.Validated; @@ -40,6 +44,8 @@ public class XzdContractTerminationController extends BaseController { private final IXzdContractTerminationService xzdContractTerminationService; private final IXzdContractDetailsService xzdContractDetailsService; + private final IXzdBusinessSealService xzdBusinessSealService; + /** * 查询承包合同终止列表 @@ -111,10 +117,19 @@ public class XzdContractTerminationController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission("xzd:contractTermination:add || xzd:contractTermination:list || xzd:contractTermination:edit") + @SaCheckPermission(value = {"xzd:contractTermination:add", "xzd:contractTermination:edit", "xzd:contractTermination:list"}, mode = SaMode.OR) @GetMapping("/detailsList") public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { return xzdContractDetailsService.queryPageList(bo, pageQuery); } + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"xzd:contractTermination:add", "xzd:contractTermination:edit", "xzd:contractTermination:list"}, mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectController.java index b7b33d45..58dba66d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectController.java @@ -1,26 +1,35 @@ package org.dromara.xzd.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 cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.lang.tree.Tree; +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.domain.vo.XzdProjectVo; -import org.dromara.xzd.domain.bo.XzdProjectBo; -import org.dromara.xzd.service.IXzdProjectService; +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.XzdProjectBo; +import org.dromara.xzd.domain.bo.XzdProjectManagerApprovalBo; +import org.dromara.xzd.domain.bo.XzdProjectTypeBo; +import org.dromara.xzd.domain.vo.XzdProjectManagerApprovalVo; +import org.dromara.xzd.domain.vo.XzdProjectTypeVo; +import org.dromara.xzd.domain.vo.XzdProjectVo; +import org.dromara.xzd.service.IXzdProjectManagerApprovalService; +import org.dromara.xzd.service.IXzdProjectService; +import org.dromara.xzd.service.IXzdProjectTypeService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 项目信息 @@ -35,6 +44,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdProjectController extends BaseController { private final IXzdProjectService xzdProjectService; + private final IXzdProjectTypeService xzdProjectTypeService; + private final IXzdProjectManagerApprovalService xzdProjectManagerApprovalService; /** * 查询项目信息列表 @@ -102,4 +113,44 @@ public class XzdProjectController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdProjectService.deleteWithValidByIds(List.of(ids), true)); } + +// /** +// * 获取用户列表 +// */ +// @SaCheckPermission("xzd:project:list || xzd:project:add || xzd:project:edit") +// @GetMapping("/userList") +// public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { +// return userService.selectPageUserList(user, pageQuery); +// } + + /** + * 查询项目类型列表 + */ + @SaCheckPermission(value = {"xzd:project:add", "xzd:project:edit", "xzd:project:list"}, mode = SaMode.OR) + @GetMapping("/projectTypeList") + public R>> list(XzdProjectTypeBo bo) { + List list = xzdProjectTypeService.queryList(bo); + return R.ok(xzdProjectTypeService.buildMenuTreeSelect(list)); + } + +// /** +// * 查询部门 +// */ +// @SaCheckPermission("xzd:project:list || xzd:project:add || xzd:project:edit") +// @GetMapping("/listDept") +// public R> list() { +// List list = iSysDeptService.querListDept(); +// return R.ok(list); +// } + + /** + * 查询项目经理推荐及审批列表 + */ + @SaCheckPermission(value = {"xzd:project:add", "xzd:project:edit", "xzd:project:list"}, mode = SaMode.OR) + @GetMapping("/projectManagerApprovalList") + public TableDataInfo list(XzdProjectManagerApprovalBo bo, PageQuery pageQuery) { + return xzdProjectManagerApprovalService.queryPageList(bo, pageQuery); + } + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectManagerApprovalController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectManagerApprovalController.java index cebb6dcc..41f6edee 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectManagerApprovalController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectManagerApprovalController.java @@ -1,26 +1,34 @@ package org.dromara.xzd.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 cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.lang.tree.Tree; +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.domain.vo.XzdProjectManagerApprovalVo; -import org.dromara.xzd.domain.bo.XzdProjectManagerApprovalBo; -import org.dromara.xzd.service.IXzdProjectManagerApprovalService; +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.system.domain.bo.SysDeptBo; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysDeptService; +import org.dromara.system.service.ISysUserService; +import org.dromara.xzd.domain.bo.XzdProjectManagerApprovalBo; +import org.dromara.xzd.domain.vo.XzdProjectManagerApprovalVo; +import org.dromara.xzd.service.IXzdProjectManagerApprovalService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 项目经理推荐及审批 @@ -35,6 +43,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdProjectManagerApprovalController extends BaseController { private final IXzdProjectManagerApprovalService xzdProjectManagerApprovalService; + private final ISysDeptService deptService; + private final ISysUserService userService; /** * 查询项目经理推荐及审批列表 @@ -102,4 +112,25 @@ public class XzdProjectManagerApprovalController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdProjectManagerApprovalService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 获取部门树列表 + */ + @SaCheckPermission(value = {"xzd:approval:add", "xzd:approval:edit", "xzd:approval:list"}, mode = SaMode.OR) + @GetMapping("/deptTree") + public R>> deptTree(SysDeptBo dept) { + return R.ok(deptService.selectDeptTreeList(dept)); + } + + /** + * 获取用户列表 + */ + @SaCheckPermission(value = {"xzd:approval:add", "xzd:approval:edit", "xzd:approval:list"}, mode = SaMode.OR) + @GetMapping("/userList") + public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { + return userService.selectPageUserList(user, pageQuery); + } + + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectTypeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectTypeController.java index 9ac79ac0..b192ee55 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectTypeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdProjectTypeController.java @@ -1,25 +1,24 @@ package org.dromara.xzd.controller; -import java.util.List; - import cn.hutool.core.lang.tree.Tree; -import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.xzd.domain.bo.XzdProjectTypeBo; -import org.dromara.xzd.domain.vo.XzdProjectTypeVo; -import org.dromara.xzd.service.IXzdProjectTypeService; -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 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.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.web.core.BaseController; +import org.dromara.xzd.domain.bo.XzdProjectTypeBo; +import org.dromara.xzd.domain.vo.XzdProjectTypeVo; +import org.dromara.xzd.service.IXzdProjectTypeService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** @@ -98,6 +97,11 @@ public class XzdProjectTypeController extends BaseController { return toAjax(xzdProjectTypeService.deleteWithValidByIds(List.of(ids), true)); } + /** + * 获取项目大类 + * @param id + * @return + */ @GetMapping("/getBigType/{id}") public R getBigType(@PathVariable Long id) { return R.ok(xzdProjectTypeService.getBigType(id)); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java index cbfe428f..a938122c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java @@ -1,28 +1,29 @@ package org.dromara.xzd.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.dromara.xzd.domain.vo.XzdCustomertypeInfoVo; -import org.dromara.xzd.domain.vo.XzdCustomertypeVo; -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.domain.vo.XzdSupplierInfoVo; -import org.dromara.xzd.domain.bo.XzdSupplierInfoBo; -import org.dromara.xzd.service.IXzdSupplierInfoService; +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.XzdSupplierInfoBo; +import org.dromara.xzd.domain.vo.XzdCustomertypeVo; +import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; +import org.dromara.xzd.service.IXzdSupplierInfoService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 供应商信息 @@ -108,7 +109,7 @@ public class XzdSupplierInfoController extends BaseController { /** * 获取类型列表 */ -// @SaCheckPermission("xzd:supplierInfo:typeList") + @SaCheckPermission(value = {"xzd:supplierInfo:add", "xzd:supplierInfo:edit", "xzd:supplierInfo:list"}, mode = SaMode.OR) @GetMapping("/typeList") public R> typeList() { return xzdSupplierInfoService.typeList(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdWorkcontractCompletionAdjustController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdWorkcontractCompletionAdjustController.java index abc8a732..cd0a67ff 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdWorkcontractCompletionAdjustController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdWorkcontractCompletionAdjustController.java @@ -1,6 +1,7 @@ package org.dromara.xzd.controller; 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; @@ -15,10 +16,13 @@ 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.XzdContractAccountBo; import org.dromara.xzd.domain.bo.XzdContractDetailsBo; import org.dromara.xzd.domain.bo.XzdWorkcontractCompletionAdjustBo; +import org.dromara.xzd.domain.vo.XzdContractAccountVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdWorkcontractCompletionAdjustVo; +import org.dromara.xzd.service.IXzdContractAccountService; import org.dromara.xzd.service.IXzdContractDetailsService; import org.dromara.xzd.service.IXzdWorkcontractCompletionAdjustService; import org.springframework.validation.annotation.Validated; @@ -40,6 +44,7 @@ public class XzdWorkcontractCompletionAdjustController extends BaseController { private final IXzdWorkcontractCompletionAdjustService xzdWorkcontractCompletionAdjustService; private final IXzdContractDetailsService xzdContractDetailsService; + private final IXzdContractAccountService xzdContractAccountService; /** @@ -112,10 +117,19 @@ public class XzdWorkcontractCompletionAdjustController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission("xzd:workcontractCompletionAdjust:add || xzd:workcontractCompletionAdjust:edit || xzd:workcontractCompletionAdjust:list") + @SaCheckPermission(value = {"xzd:workcontractCompletionAdjust:add", "xzd:workcontractCompletionAdjust:edit", "xzd:workcontractCompletionAdjust:list"}, mode = SaMode.OR) @GetMapping("/detailsList") public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { return xzdContractDetailsService.queryPageList(bo, pageQuery); } + /** + * 查询承包合同竣工结算列表 + */ + @SaCheckPermission(value = {"xzd:workcontractCompletionAdjust:add", "xzd:workcontractCompletionAdjust:edit", "xzd:workcontractCompletionAdjust:list"}, mode = SaMode.OR) + @GetMapping("/contractAccountList") + public TableDataInfo list(XzdContractAccountBo bo, PageQuery pageQuery) { + return xzdContractAccountService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java index 9f71284d..60547fb0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java @@ -1,31 +1,35 @@ package org.dromara.xzd.costProjectApproval.costBudget.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.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbBo; -import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbVo; -import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbService; -import org.springframework.context.annotation.Lazy; -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.costProjectApproval.costBudget.domain.vo.XzdCbysJdcbfjVo; -import org.dromara.xzd.costProjectApproval.costBudget.domain.bo.XzdCbysJdcbfjBo; -import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysJdcbfjService; +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.costProjectApproval.costBudget.domain.bo.XzdCbysJdcbfjBo; +import org.dromara.xzd.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbBo; +import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysJdcbfjVo; +import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbVo; +import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysJdcbfjService; +import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 立项及成本-成本预算-阶段成本分解 @@ -40,6 +44,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdCbysJdcbfjController extends BaseController { private final IXzdCbysJdcbfjService xzdCbysJdcbfjService; + private final IXzdBusinessSealService xzdBusinessSealService; @Lazy private final IXzdCbysZjhcbService xzdCbysZjhcbService; @@ -119,4 +124,14 @@ public class XzdCbysJdcbfjController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdCbysJdcbfjService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"costBudget:cbysJdcbfj:add","costBudget:cbysJdcbfj:edit","costBudget:cbysJdcbfj:list"}, mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java index a4be11f1..9b0a3c43 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java @@ -1,31 +1,35 @@ package org.dromara.xzd.costProjectApproval.costBudget.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.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbBo; -import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbVo; -import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbService; -import org.springframework.context.annotation.Lazy; -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.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbAlterationVo; -import org.dromara.xzd.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbAlterationBo; -import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbAlterationService; +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.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbAlterationBo; +import org.dromara.xzd.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbBo; +import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbAlterationVo; +import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbVo; +import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbAlterationService; +import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 立项及成本-成本预算-总体计划成本变更 @@ -40,6 +44,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdCbysZjhcbAlterationController extends BaseController { private final IXzdCbysZjhcbAlterationService xzdCbysZjhcbAlterationService; + private final IXzdBusinessSealService xzdBusinessSealService; @Lazy @@ -120,4 +125,14 @@ public class XzdCbysZjhcbAlterationController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdCbysZjhcbAlterationService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"costBudget:cbysZjhcbAlteration:add","costBudget:cbysZjhcbAlteration:edit","costBudget:cbysZjhcbAlteration:list"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java index 7cf647f0..38afe104 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java @@ -1,31 +1,35 @@ package org.dromara.xzd.paymentsReceipts.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.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; -import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; -import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; -import org.springframework.context.annotation.Lazy; -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.paymentsReceipts.domain.vo.XzdSfkCaigouFkVo; -import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkCaigouFkBo; -import org.dromara.xzd.paymentsReceipts.service.IXzdSfkCaigouFkService; +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.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkCaigouFkBo; +import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkCaigouFkVo; +import org.dromara.xzd.paymentsReceipts.service.IXzdSfkCaigouFkService; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 采购合同付款 @@ -40,10 +44,20 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdSfkCaigouFkController extends BaseController { private final IXzdSfkCaigouFkService xzdSfkCaigouFkService; + private final IXzdBusinessSealService xzdBusinessSealService; @Lazy private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"paymentsReceipts:sfkCaigouFk:list","paymentsReceipts:sfkCaigouFk:add","paymentsReceipts:sfkCaigouFk:edit"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询采购合同信息列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java index 1a972bb7..d403a779 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java @@ -1,31 +1,35 @@ package org.dromara.xzd.paymentsReceipts.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.comprehensive.domain.bo.XzdCsContractInformationBo; -import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; -import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; -import org.springframework.context.annotation.Lazy; -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.paymentsReceipts.domain.vo.XzdSfkZonhefuwuFkVo; -import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkZonhefuwuFkBo; -import org.dromara.xzd.paymentsReceipts.service.IXzdSfkZonhefuwuFkService; +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.comprehensive.domain.bo.XzdCsContractInformationBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkZonhefuwuFkBo; +import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkZonhefuwuFkVo; +import org.dromara.xzd.paymentsReceipts.service.IXzdSfkZonhefuwuFkService; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 综合服务合同付款 @@ -40,11 +44,19 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdSfkZonhefuwuFkController extends BaseController { private final IXzdSfkZonhefuwuFkService xzdSfkZonhefuwuFkService; + private final IXzdBusinessSealService xzdBusinessSealService; @Lazy private final IXzdCsContractInformationService xzdCsContractInformationService; - + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"settlement:jsZhfwJindu:add","settlement:jsZhfwJindu:edit","settlement:jsZhfwJindu:list"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } /** * 查询综合服务合同信息列表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java index 73236303..76bf39f8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java @@ -1,31 +1,35 @@ package org.dromara.xzd.settlement.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.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; -import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; -import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; -import org.springframework.context.annotation.Lazy; -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.settlement.domain.vo.XzdJsCgJinduVo; -import org.dromara.xzd.settlement.domain.bo.XzdJsCgJinduBo; -import org.dromara.xzd.settlement.service.IXzdJsCgJinduService; +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.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.dromara.xzd.settlement.domain.bo.XzdJsCgJinduBo; +import org.dromara.xzd.settlement.domain.vo.XzdJsCgJinduVo; +import org.dromara.xzd.settlement.service.IXzdJsCgJinduService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 采购合同进度结算 @@ -40,8 +44,20 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdJsCgJinduController extends BaseController { private final IXzdJsCgJinduService xzdJsCgJinduService; + + @Lazy private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"settlement:jsCgJindu:list","settlement:jsCgJindu:add","settlement:jsCgJindu:edit"}, mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } /** * 查询采购合同信息列表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java index cb7c1c5c..5a0e4aa3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java @@ -1,31 +1,35 @@ package org.dromara.xzd.settlement.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.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; -import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; -import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; -import org.springframework.context.annotation.Lazy; -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.settlement.domain.vo.XzdJsCgJungonVo; -import org.dromara.xzd.settlement.domain.bo.XzdJsCgJungonBo; -import org.dromara.xzd.settlement.service.IXzdJsCgJungonService; +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.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.dromara.xzd.settlement.domain.bo.XzdJsCgJungonBo; +import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo; +import org.dromara.xzd.settlement.service.IXzdJsCgJungonService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 采购合同竣工结算 @@ -45,6 +49,18 @@ public class XzdJsCgJungonController extends BaseController { @Lazy private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"settlement:jsCgJungon:list","settlement:jsCgJungon:add","settlement:jsCgJungon:edit"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询采购合同信息列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java index 7d9e77e8..09e08b31 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java @@ -16,6 +16,9 @@ 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.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.dromara.xzd.settlement.domain.bo.XzdJsCgJungonBo; import org.dromara.xzd.settlement.domain.bo.XzdJsCgJungonEditBo; import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonEditVo; @@ -45,6 +48,17 @@ public class XzdJsCgJungonEditController extends BaseController { @Lazy private final IXzdJsCgJungonService xzdJsCgJungonService; + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"settlement:jsCgJungonEdit:list","settlement:jsCgJungonEdit:add","settlement:jsCgJungonEdit:edit"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询采购合同竣工结算列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java index 50f2e435..b87656d4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java @@ -1,31 +1,35 @@ package org.dromara.xzd.settlement.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.comprehensive.domain.bo.XzdCsContractInformationBo; -import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; -import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; -import org.springframework.context.annotation.Lazy; -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.settlement.domain.vo.XzdJsZhfwJinduVo; -import org.dromara.xzd.settlement.domain.bo.XzdJsZhfwJinduBo; -import org.dromara.xzd.settlement.service.IXzdJsZhfwJinduService; +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.comprehensive.domain.bo.XzdCsContractInformationBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.dromara.xzd.settlement.domain.bo.XzdJsZhfwJinduBo; +import org.dromara.xzd.settlement.domain.vo.XzdJsZhfwJinduVo; +import org.dromara.xzd.settlement.service.IXzdJsZhfwJinduService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 综合服务合同进度结算 @@ -44,6 +48,18 @@ public class XzdJsZhfwJinduController extends BaseController { @Lazy private final IXzdCsContractInformationService xzdCsContractInformationService; + + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"settlement:jsZhfwJindu:add","settlement:jsZhfwJindu:edit","settlement:jsZhfwJindu:list"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询综合服务合同进度结算列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java index 0ec3d0f9..46ac9ddb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java @@ -1,30 +1,34 @@ package org.dromara.xzd.settlement.fenbaohetongjingdu.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.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.settlement.fenbaohetongjingdu.domain.vo.SettlementOfSubcontractingContractVo; -import org.dromara.xzd.settlement.fenbaohetongjingdu.domain.bo.SettlementOfSubcontractingContractBo; -import org.dromara.xzd.settlement.fenbaohetongjingdu.service.ISettlementOfSubcontractingContractService; +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.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.dromara.xzd.settlement.fenbaohetongjingdu.domain.bo.SettlementOfSubcontractingContractBo; +import org.dromara.xzd.settlement.fenbaohetongjingdu.domain.vo.SettlementOfSubcontractingContractVo; +import org.dromara.xzd.settlement.fenbaohetongjingdu.service.ISettlementOfSubcontractingContractService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 分包合同进度结算 @@ -42,6 +46,16 @@ public class SettlementOfSubcontractingContractController extends BaseController private final IXzdSubcontractService xzdSubcontractService; + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"fenbaohetongjingdu:ofSubcontractingContract:list","fenbaohetongjingdu:ofSubcontractingContract:add","fenbaohetongjingdu:ofSubcontractingContract:edit"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } /** * 查询分包合同信息列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/controller/XzdContractPaymentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/controller/XzdContractPaymentController.java index 36b93a1e..762a56d2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/controller/XzdContractPaymentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/controller/XzdContractPaymentController.java @@ -1,6 +1,7 @@ package org.dromara.xzd.skyfk.cbhtsc.controller; 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; @@ -111,7 +112,7 @@ public class XzdContractPaymentController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission("skyfk:contractPayment:add || skyfk:contractPayment:edit || skyfk:contractPayment:list") + @SaCheckPermission(value = {"skyfk:contractPayment:add", "skyfk:contractPayment:edit", "skyfk:contractPayment:list"}, mode = SaMode.OR) @GetMapping("/detailsList") public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { return xzdContractDetailsService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java index ab638845..2f414e1b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java @@ -1,6 +1,8 @@ package org.dromara.xzd.skyfk.fbhtfk.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -18,6 +20,13 @@ 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.domain.bo.XzdProjectTypeBo; +import org.dromara.xzd.domain.vo.XzdProjectTypeVo; +import org.dromara.xzd.domain.vo.XzdProjectVo; +import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; +import org.dromara.xzd.service.IXzdProjectService; +import org.dromara.xzd.service.IXzdProjectTypeService; +import org.dromara.xzd.service.IXzdSupplierInfoService; import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo; import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo; import org.dromara.xzd.skyfk.fbhtfk.service.impl.XzdSkyfkFbhtfkServiceImpl; @@ -41,6 +50,9 @@ public class XzdSkyfkFbhtfkController extends BaseController { private final XzdSkyfkFbhtfkServiceImpl xzdSkyfkFbhtfkService; private final IXzdSubcontractService xzdSubcontractService; + private final IXzdProjectTypeService xzdProjectTypeService; + private final IXzdSupplierInfoService xzdSupplierInfoService; + private final IXzdProjectService xzdProjectService; /** * 查询收款与付款-分包合同付款列表 @@ -120,10 +132,44 @@ public class XzdSkyfkFbhtfkController extends BaseController { /** * 查询分包合同信息列表 */ - @SaCheckPermission("fbhtfk:skyfkFbhtfk:add || fbhtfk:skyfkFbhtfk:edit || fbhtfk:skyfkFbhtfk:list") + @SaCheckPermission(value = {"fbhtfk:skyfkFbhtfk:add", "fbhtfk:skyfkFbhtfk:edit", "fbhtfk:skyfkFbhtfk:list"}, mode = SaMode.OR) @GetMapping("/subcontractList") public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { return xzdSubcontractService.queryPageList(bo, pageQuery); } + /** + * 查询项目类型列表 + */ + @GetMapping("/projectTypeList") + @SaCheckPermission(value = {"fbhtfk:skyfkFbhtfk:add", "fbhtfk:skyfkFbhtfk:edit", "fbhtfk:skyfkFbhtfk:list"}, mode = SaMode.OR) + public R>> list(XzdProjectTypeBo bo) { + List list = xzdProjectTypeService.queryList(bo); + return R.ok(xzdProjectTypeService.buildMenuTreeSelect(list)); + } + + /** + * 获取供应商信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"fbhtfk:skyfkFbhtfk:add", "fbhtfk:skyfkFbhtfk:edit", "fbhtfk:skyfkFbhtfk:list"}, mode = SaMode.OR) + @GetMapping("/getSupplierInfo/{id}") + public R getSupplierInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdSupplierInfoService.queryById(id)); + } + + /** + * 获取项目信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"fbhtfk:skyfkFbhtfk:add", "fbhtfk:skyfkFbhtfk:edit", "fbhtfk:skyfkFbhtfk:list"}, mode = SaMode.OR) + @GetMapping("/getProjectInfo/{id}") + public R getProjectInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdProjectService.queryById(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 51786aa9..3bcdbc6b 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 @@ -1,6 +1,7 @@ package org.dromara.xzd.spykp.kpsq.controller; 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; @@ -16,8 +17,11 @@ 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.bo.XzdProjectBo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.domain.vo.XzdProjectVo; import org.dromara.xzd.service.IXzdContractDetailsService; +import org.dromara.xzd.service.IXzdProjectService; import org.dromara.xzd.spykp.kpsq.domain.bo.XzdSpykpKpsqBo; import org.dromara.xzd.spykp.kpsq.domain.vo.XzdSpykpKpsqVo; import org.dromara.xzd.spykp.kpsq.service.IXzdSpykpKpsqService; @@ -40,6 +44,7 @@ public class XzdSpykpKpsqController extends BaseController { private final IXzdSpykpKpsqService xzdSpykpKpsqService; private final IXzdContractDetailsService xzdContractDetailsService; + private final IXzdProjectService xzdProjectService; /** * 查询收票与开票-开票申请列表 @@ -111,10 +116,19 @@ public class XzdSpykpKpsqController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission("kpsq:kpsq:add || kpsq:kpsq:edit || kpsq:kpsq:list") + @SaCheckPermission(value = {"kpsq:kpsq:add", "kpsq:kpsq:edit", "kpsq:kpsq:list"}, mode = SaMode.OR) @GetMapping("/detailsList") public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { return xzdContractDetailsService.queryPageList(bo, pageQuery); } + /** + * 查询项目信息列表 + */ + @SaCheckPermission(value = {"kpsq:kpsq:add", "kpsq:kpsq:edit", "kpsq:kpsq:list"}, mode = SaMode.OR) + @GetMapping("/projectList") + public TableDataInfo list(XzdProjectBo bo, PageQuery pageQuery) { + return xzdProjectService.queryPageList(bo, pageQuery); + } + } 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 8bc28569..9b843ed2 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 @@ -1,6 +1,7 @@ package org.dromara.xzd.spykp.sjsqd.controller; 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; @@ -15,9 +16,24 @@ 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.comprehensive.domain.bo.XzdCsContractInformationBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; +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.contractManagement.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.bo.XzdProjectBo; +import org.dromara.xzd.domain.dto.XzdClienteleListDto; +import org.dromara.xzd.domain.vo.XzdClienteleListSumVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.domain.vo.XzdProjectVo; import org.dromara.xzd.service.IXzdContractDetailsService; +import org.dromara.xzd.service.IXzdCorrespondentList; +import org.dromara.xzd.service.IXzdProjectService; import org.dromara.xzd.spykp.sjsqd.domain.bo.XzdSpykpSjsqdBo; import org.dromara.xzd.spykp.sjsqd.domain.vo.XzdSpykpSjsqdVo; import org.dromara.xzd.spykp.sjsqd.service.IXzdSpykpSjsqdService; @@ -40,6 +56,11 @@ public class XzdSpykpSjsqdController extends BaseController { private final IXzdSpykpSjsqdService xzdSpykpSjsqdService; private final IXzdContractDetailsService xzdContractDetailsService; + private final IXzdProjectService xzdProjectService; + private final IXzdCorrespondentList iXzdCorrespondentList; + private final IXzdSubcontractService xzdSubcontractService; + private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + private final IXzdCsContractInformationService xzdCsContractInformationService; /** * 查询收据申请单列表 @@ -111,10 +132,55 @@ public class XzdSpykpSjsqdController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission("sjsqd:sjsqd:add || sjsqd:sjsqd:edit || sjsqd:sjsqd:list") + @SaCheckPermission(value = {"sjsqd:sjsqd:add", "sjsqd:sjsqd:edit", "sjsqd:sjsqd:list"}, mode = SaMode.OR) @GetMapping("/detailsList") public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { return xzdContractDetailsService.queryPageList(bo, pageQuery); } + /** + * 查询项目信息列表 + */ + @SaCheckPermission(value = {"sjsqd:sjsqd:add", "sjsqd:sjsqd:edit", "sjsqd:sjsqd:list"}, mode = SaMode.OR) + @GetMapping("/projectList") + public TableDataInfo list(XzdProjectBo bo, PageQuery pageQuery) { + return xzdProjectService.queryPageList(bo, pageQuery); + } + + /** + * 客户信息列表 + */ + @SaCheckPermission(value = {"sjsqd:sjsqd:add", "sjsqd:sjsqd:edit", "sjsqd:sjsqd:list"}, mode = SaMode.OR) + @GetMapping("/queryCustomertype") + public R queryCustomertype(XzdClienteleListDto dto, PageQuery pageQuery) { + return iXzdCorrespondentList.queryCustomertype(dto, pageQuery); + } + + /** + * 查询分包合同信息列表 + */ + @SaCheckPermission(value = {"sjsqd:sjsqd:add", "sjsqd:sjsqd:edit", "sjsqd:sjsqd:list"}, mode = SaMode.OR) + @GetMapping("/subcontractList") + public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { + return xzdSubcontractService.queryPageList(bo, pageQuery); + } + + /** + * 查询采购合同信息列表 + */ + @SaCheckPermission(value = {"sjsqd:sjsqd:add", "sjsqd:sjsqd:edit", "sjsqd:sjsqd:list"}, mode = SaMode.OR) + @GetMapping("/purchaseContractInformationList") + public TableDataInfo list(XzdPurchaseContractInformationBo bo, PageQuery pageQuery) { + return xzdPurchaseContractInformationService.queryPageList(bo, pageQuery); + } + + /** + * 查询综合服务合同信息列表 + */ + @SaCheckPermission(value = {"sjsqd:sjsqd:add", "sjsqd:sjsqd:edit", "sjsqd:sjsqd:list"}, mode = SaMode.OR) + @GetMapping("/csContractInformationList") + public TableDataInfo list(XzdCsContractInformationBo bo, PageQuery pageQuery) { + return xzdCsContractInformationService.queryPageList(bo, pageQuery); + } + }