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 5c656513..ef495806 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 @@ -131,4 +131,16 @@ public class XzdContractChangeController extends BaseController { return xzdBusinessSealService.queryPageList(bo, pageQuery); } + /** + * 获取承包合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"xzd:contractChange:add","xzd:contractChange:edit","xzd:contractChange:list"}, mode = SaMode.OR) + @GetMapping("/contractDetails/{id}") + public R getContractDetailsInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdContractDetailsService.queryById(id)); + } + } 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 05ea0a29..024bd997 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 @@ -16,17 +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.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.dromara.xzd.domain.bo.*; +import org.dromara.xzd.domain.vo.*; +import org.dromara.xzd.service.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,6 +40,8 @@ public class XzdContractDetailsController extends BaseController { private final IXzdProjectService xzdProjectService; private final IXzdBusinessSealService xzdBusinessSealService; private final IXzdProjectTypeService xzdProjectTypeService; + private final IXzdContractChangeService xzdContractChangeService; + private final IXzdContractTerminationService xzdContractTerminationService; /** * 查询承包合同信息列表 @@ -157,5 +151,46 @@ public class XzdContractDetailsController extends BaseController { return R.ok(xzdProjectTypeService.getBigType(id)); } + /** + * 获取承包合同变更详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"xzd:contractDetails:add", "xzd:contractDetails:edit", "xzd:contractDetails:list"}, mode = SaMode.OR) + @GetMapping("/changeInfo/{id}") + public R getChangeInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdContractChangeService.queryById(id)); + } + + /** + * 获取承包合同终止详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"xzd:contractDetails:add", "xzd:contractDetails:edit", "xzd:contractDetails:list"}, mode = SaMode.OR) + @GetMapping("/contractTermination/{id}") + public R getContractTerminationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdContractTerminationService.queryById(id)); + } + + /** + * 查询承包合同变更列表 + */ + @SaCheckPermission(value = {"xzd:contractDetails:add", "xzd:contractDetails:edit", "xzd:contractDetails:list"}, mode = SaMode.OR) + @GetMapping("/contractChangeList") + public TableDataInfo list(XzdContractChangeBo bo, PageQuery pageQuery) { + return xzdContractChangeService.queryPageList(bo, pageQuery); + } + + /** + * 查询承包合同终止列表 + */ + @SaCheckPermission(value = {"xzd:contractDetails:add", "xzd:contractDetails:edit", "xzd:contractDetails:list"}, mode = SaMode.OR) + @GetMapping("/contractTerminationList") + public TableDataInfo list(XzdContractTerminationBo bo, PageQuery pageQuery) { + return xzdContractTerminationService.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 11264bd1..8c98a13b 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 @@ -132,4 +132,16 @@ public class XzdContractTerminationController extends BaseController { return xzdBusinessSealService.queryPageList(bo, pageQuery); } + /** + * 获取承包合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"xzd:contractTermination:add", "xzd:contractTermination:edit", "xzd:contractTermination:list"}, mode = SaMode.OR) + @GetMapping("/contractDetails/{id}") + public R getContractDetailsInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdContractDetailsService.queryById(id)); + } + }