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 6e4cc3cb..dc886874 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,26 +1,30 @@ 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 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.XzdContractAccountVo; -import org.dromara.xzd.domain.bo.XzdContractAccountBo; -import org.dromara.xzd.service.IXzdContractAccountService; +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.XzdContractAccountBo; +import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractAccountVo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.service.IXzdContractAccountService; +import org.dromara.xzd.service.IXzdContractDetailsService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 承包合同竣工结算 @@ -35,6 +39,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdContractAccountController extends BaseController { private final IXzdContractAccountService xzdContractAccountService; + private final IXzdContractDetailsService xzdContractDetailsService; + /** * 查询承包合同竣工结算列表 @@ -102,4 +108,14 @@ public class XzdContractAccountController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdContractAccountService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission("xzd:contractAccount:add || xzd:contractAccount:edit || xzd:contractAccount:list") + @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 4661692c..15d77a5b 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,26 +1,30 @@ 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 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.XzdContractChangeVo; -import org.dromara.xzd.domain.bo.XzdContractChangeBo; -import org.dromara.xzd.service.IXzdContractChangeService; +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.XzdContractChangeBo; +import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractChangeVo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.service.IXzdContractChangeService; +import org.dromara.xzd.service.IXzdContractDetailsService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 承包合同变更 @@ -35,6 +39,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdContractChangeController extends BaseController { private final IXzdContractChangeService xzdContractChangeService; + private final IXzdContractDetailsService xzdContractDetailsService; /** * 查询承包合同变更列表 @@ -102,4 +107,14 @@ public class XzdContractChangeController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdContractChangeService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission("xzd:contractChange:add || xzd:contractChange:edit || xzd:contractChange:list") + @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/XzdContractProgressSettlementController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractProgressSettlementController.java index f53d42c0..4efc2de1 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,26 +1,30 @@ 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 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.XzdContractProgressSettlementVo; -import org.dromara.xzd.domain.bo.XzdContractProgressSettlementBo; -import org.dromara.xzd.service.IXzdContractProgressSettlementService; +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.bo.XzdContractProgressSettlementBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.domain.vo.XzdContractProgressSettlementVo; +import org.dromara.xzd.service.IXzdContractDetailsService; +import org.dromara.xzd.service.IXzdContractProgressSettlementService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 承包合同进度结算 @@ -35,6 +39,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdContractProgressSettlementController extends BaseController { private final IXzdContractProgressSettlementService xzdContractProgressSettlementService; + private final IXzdContractDetailsService xzdContractDetailsService; + /** * 查询承包合同进度结算列表 @@ -102,4 +108,14 @@ public class XzdContractProgressSettlementController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdContractProgressSettlementService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission("xzd:contractProgressSettlement:add || xzd:contractProgressSettlement:edit || xzd:contractProgressSettlement:list") + @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/XzdContractTerminationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractTerminationController.java index f2c200e2..0af2b39d 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,26 +1,30 @@ 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 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.XzdContractTerminationVo; -import org.dromara.xzd.domain.bo.XzdContractTerminationBo; -import org.dromara.xzd.service.IXzdContractTerminationService; +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.bo.XzdContractTerminationBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.domain.vo.XzdContractTerminationVo; +import org.dromara.xzd.service.IXzdContractDetailsService; +import org.dromara.xzd.service.IXzdContractTerminationService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 承包合同终止 @@ -35,6 +39,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdContractTerminationController extends BaseController { private final IXzdContractTerminationService xzdContractTerminationService; + private final IXzdContractDetailsService xzdContractDetailsService; /** * 查询承包合同终止列表 @@ -102,4 +107,14 @@ public class XzdContractTerminationController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdContractTerminationService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission("xzd:contractTermination:add || xzd:contractTermination:list || xzd:contractTermination:edit") + @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/XzdWorkcontractCompletionAdjustController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdWorkcontractCompletionAdjustController.java index 96db551a..abc8a732 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,26 +1,30 @@ 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 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.XzdWorkcontractCompletionAdjustVo; -import org.dromara.xzd.domain.bo.XzdWorkcontractCompletionAdjustBo; -import org.dromara.xzd.service.IXzdWorkcontractCompletionAdjustService; +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.bo.XzdWorkcontractCompletionAdjustBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.domain.vo.XzdWorkcontractCompletionAdjustVo; +import org.dromara.xzd.service.IXzdContractDetailsService; +import org.dromara.xzd.service.IXzdWorkcontractCompletionAdjustService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 承包合同竣工结算调整 @@ -35,6 +39,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdWorkcontractCompletionAdjustController extends BaseController { private final IXzdWorkcontractCompletionAdjustService xzdWorkcontractCompletionAdjustService; + private final IXzdContractDetailsService xzdContractDetailsService; + /** * 查询承包合同竣工结算调整列表 @@ -102,4 +108,14 @@ public class XzdWorkcontractCompletionAdjustController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdWorkcontractCompletionAdjustService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission("xzd:workcontractCompletionAdjust:add || xzd:workcontractCompletionAdjust:edit || xzd:workcontractCompletionAdjust:list") + @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/settlement/controller/XzdJsCgJungonEditController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java index 9e5f9dae..e0855a93 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 @@ -1,30 +1,31 @@ package org.dromara.xzd.settlement.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.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.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 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.XzdJsCgJungonEditVo; -import org.dromara.xzd.settlement.domain.bo.XzdJsCgJungonEditBo; -import org.dromara.xzd.settlement.service.IXzdJsCgJungonEditService; +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.settlement.domain.bo.XzdJsCgJungonBo; +import org.dromara.xzd.settlement.domain.bo.XzdJsCgJungonEditBo; +import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonEditVo; +import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo; +import org.dromara.xzd.settlement.service.IXzdJsCgJungonEditService; +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; /** * 采购合同竣工结算调整 @@ -56,7 +57,7 @@ public class XzdJsCgJungonEditController extends BaseController { * 查询采购合同竣工结算调整列表 */ @SaCheckPermission("settlement:jsCgJungonEdit:list") - @GetMapping("/list") + @GetMapping("/jsCgJungonEditList") public TableDataInfo list(XzdJsCgJungonEditBo bo, PageQuery pageQuery) { return xzdJsCgJungonEditService.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 b75e6840..36b93a1e 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 @@ -15,6 +15,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.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.service.IXzdContractDetailsService; import org.dromara.xzd.skyfk.cbhtsc.domain.bo.XzdContractPaymentBo; import org.dromara.xzd.skyfk.cbhtsc.domain.vo.XzdContractPaymentVo; import org.dromara.xzd.skyfk.cbhtsc.service.IXzdContractPaymentService; @@ -36,6 +39,7 @@ import java.util.List; public class XzdContractPaymentController extends BaseController { private final IXzdContractPaymentService xzdContractPaymentService; + private final IXzdContractDetailsService xzdContractDetailsService; /** * 查询承包合同收款列表 @@ -103,4 +107,14 @@ public class XzdContractPaymentController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdContractPaymentService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission("skyfk:contractPayment:add || skyfk:contractPayment:edit || skyfk:contractPayment:list") + @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 338f6791..58ac9ea3 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 @@ -15,6 +15,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.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.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo; import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo; import org.dromara.xzd.skyfk.fbhtfk.service.impl.XzdSkyfkFbhtfkServiceImpl; @@ -37,6 +40,7 @@ import java.util.List; public class XzdSkyfkFbhtfkController extends BaseController { private final XzdSkyfkFbhtfkServiceImpl xzdSkyfkFbhtfkService; + private final IXzdSubcontractService xzdSubcontractService; /** * 查询收款与付款-分包合同付款列表 @@ -113,4 +117,13 @@ public class XzdSkyfkFbhtfkController extends BaseController { return R.ok(xzdSkyfkFbhtfkService.getLJKPJE(contractId)); } + /** + * 查询分包合同信息列表 + */ + @SaCheckPermission("fbhtfk:skyfkFbhtfk:add || fbhtfk:skyfkFbhtfk:edit || fbhtfk:skyfkFbhtfk:list") + @GetMapping("/list") + public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { + return xzdSubcontractService.queryPageList(bo, pageQuery); + } + } 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 b895370b..51786aa9 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 @@ -15,6 +15,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.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.service.IXzdContractDetailsService; 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; @@ -36,6 +39,7 @@ import java.util.List; public class XzdSpykpKpsqController extends BaseController { private final IXzdSpykpKpsqService xzdSpykpKpsqService; + private final IXzdContractDetailsService xzdContractDetailsService; /** * 查询收票与开票-开票申请列表 @@ -103,4 +107,14 @@ public class XzdSpykpKpsqController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdSpykpKpsqService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission("kpsq:kpsq:add || kpsq:kpsq:edit || kpsq:kpsq:list") + @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/spykp/sjsqd/controller/XzdSpykpSjsqdController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/controller/XzdSpykpSjsqdController.java index d84cd570..8bc28569 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 @@ -15,6 +15,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.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.service.IXzdContractDetailsService; 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; @@ -36,6 +39,7 @@ import java.util.List; public class XzdSpykpSjsqdController extends BaseController { private final IXzdSpykpSjsqdService xzdSpykpSjsqdService; + private final IXzdContractDetailsService xzdContractDetailsService; /** * 查询收据申请单列表 @@ -103,4 +107,14 @@ public class XzdSpykpSjsqdController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdSpykpSjsqdService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission("sjsqd:sjsqd:add || sjsqd:sjsqd:edit || sjsqd:sjsqd:list") + @GetMapping("/detailsList") + public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { + return xzdContractDetailsService.queryPageList(bo, pageQuery); + } + }