diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java
index 4cb9e8b5..4fd65b3d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java
@@ -10,6 +10,10 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.dto.QuerBiddingManagementDto;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QueryListXzdVo;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService;
+import org.dromara.xzd.biddingManagement.earnestMoney.domain.bo.XzdBidDepositPaymentBo;
+import org.dromara.xzd.biddingManagement.earnestMoney.domain.vo.XzdBidDepositPaymentByBqlx;
+import org.dromara.xzd.biddingManagement.earnestMoney.domain.vo.XzdBidDepositPaymentVo;
+import org.dromara.xzd.biddingManagement.earnestMoney.service.IXzdBidDepositPaymentService;
 import org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.bo.XzdBidDepositRecoveryBo;
 import org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.vo.XzdBidDepositRecoveryVo;
 import org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.vo.XzdBidDepositRecoveryXqVo;
@@ -43,6 +47,8 @@ public class XzdBidDepositRecoveryController extends BaseController {
     private final IXzdBidDepositRecoveryService xzdBidDepositRecoveryService;
 
     private final IXzdBidPreProjectService xzdBidPreProjectService;
+    private final IXzdBidDepositPaymentService xzdBidDepositPaymentService;
+
 
     /**
      * 查询投标保证金收回列表
@@ -119,4 +125,26 @@ public class XzdBidDepositRecoveryController extends BaseController {
     public QueryListXzdVo list(QuerBiddingManagementDto bo, PageQuery pageQuery) {
         return xzdBidPreProjectService.queryPageList(bo, pageQuery);
     }
+
+    /**
+     * 查询投标保证金缴纳列表
+     */
+    @SaCheckPermission(value = {"biddingManagement:bidDepositRecovery:list","biddingManagement:bidDepositRecovery:add","biddingManagement:bidDepositRecovery:edit"},mode = SaMode.OR)
+    @GetMapping("/getxzdBidDepositPayment")
+    public TableDataInfo<XzdBidDepositPaymentVo> list(XzdBidDepositPaymentBo bo, PageQuery pageQuery) {
+        return xzdBidDepositPaymentService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取投标保证金缴纳详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value = {"biddingManagement:bidDepositRecovery:list","biddingManagement:bidDepositRecovery:add","biddingManagement:bidDepositRecovery:edit"},mode = SaMode.OR)
+    @GetMapping("/get/{id}")
+    public R<XzdBidDepositPaymentByBqlx> getInfoxzdBidDeposit(@NotNull(message = "主键不能为空")
+                                                 @PathVariable Long id) {
+        return R.ok(xzdBidDepositPaymentService.queryById(id));
+    }
+
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java
index a19f39e8..cf379d0e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java
@@ -138,6 +138,19 @@ public class XzdSubcontractChangeController extends BaseController {
     }
 
 
+    /**
+     * 获取分包合同信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value={"fenbaohetongbiangg:subcontractChange:list","fenbaohetongbiangg:subcontractChange:add","fenbaohetongbiangg:subcontractChange:edit"}, mode = SaMode.OR)
+    @GetMapping("/xx/{id}")
+    public R<XzdSubcontractVo> getInfoxx(@NotNull(message = "主键不能为空")
+                                         @PathVariable Long id) {
+        return R.ok(xzdSubcontractService.queryById(id));
+    }
+
+
 
 
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java
index 1b850419..311e47cc 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java
@@ -7,10 +7,17 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.bo.XzdSubcontractChangeBo;
+import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.vo.XzdSubcontractChangeVo;
+import org.dromara.xzd.contractManagement.fenbaohetongbiangg.service.IXzdSubcontractChangeService;
 import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdJdztVo;
+import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.domain.bo.XzdSubcontractTerminationBo;
+import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.domain.vo.XzdSubcontractTerminationVo;
+import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.service.IXzdSubcontractTerminationService;
 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.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -43,6 +50,56 @@ public class XzdSubcontractController extends BaseController {
 
     private final IXzdBusinessSealService xzdBusinessSealService;
 
+    @Lazy
+    private final IXzdSubcontractChangeService xzdSubcontractChangeService;
+
+    @Lazy
+    private final IXzdSubcontractTerminationService xzdSubcontractTerminationService;
+
+
+    /**
+     * 查询分包合同终止列表
+     */
+    @SaCheckPermission(value={"fenbaohetongxinxi:subcontract:list","fenbaohetongxinxi:subcontract:add","fenbaohetongxinxi:subcontract:edit"}, mode = SaMode.OR)
+    @GetMapping("/listzz")
+    public TableDataInfo<XzdSubcontractTerminationVo> list(XzdSubcontractTerminationBo bo, PageQuery pageQuery) {
+        return xzdSubcontractTerminationService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询分包合同变更列表
+     */
+    @SaCheckPermission(value={"fenbaohetongxinxi:subcontract:list","fenbaohetongxinxi:subcontract:add","fenbaohetongxinxi:subcontract:edit"}, mode = SaMode.OR)
+    @GetMapping("/listbg")
+    public TableDataInfo<XzdSubcontractChangeVo> list(XzdSubcontractChangeBo bo, PageQuery pageQuery) {
+        return xzdSubcontractChangeService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 获取分包合同变更详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value={"fenbaohetongxinxi:subcontract:list","fenbaohetongxinxi:subcontract:add","fenbaohetongxinxi:subcontract:edit"}, mode = SaMode.OR)
+    @GetMapping("/bg/{id}")
+    public R<XzdSubcontractChangeVo> getInfobg(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(xzdSubcontractChangeService.queryById(id));
+    }
+
+    /**
+     * 获取分包合同终止详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value={"fenbaohetongxinxi:subcontract:list","fenbaohetongxinxi:subcontract:add","fenbaohetongxinxi:subcontract:edit"}, mode = SaMode.OR)
+    @GetMapping("/zz/{id}")
+    public R<XzdSubcontractTerminationVo> getInfozz(@NotNull(message = "主键不能为空")
+                                                  @PathVariable Long id) {
+        return R.ok(xzdSubcontractTerminationService.queryById(id));
+    }
+
     /**
      * 查询印章帮助列表
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java
index f9c8249d..b1345d43 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java
@@ -134,4 +134,19 @@ public class XzdSubcontractTerminationController extends BaseController {
     public TableDataInfo<XzdSubcontractVo> list(XzdSubcontractBo bo, PageQuery pageQuery) {
         return xzdSubcontractService.queryPageList(bo, pageQuery);
     }
+
+    /**
+     * 获取分包合同信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value={"fenbaohetongzhongzhi:subcontractTermination:list","fenbaohetongzhongzhi:subcontractTermination:add","fenbaohetongzhongzhi:subcontractTermination:edit"}, mode = SaMode.OR)
+    @GetMapping("/xx/{id}")
+    public R<XzdSubcontractVo> getInfoxx(@NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(xzdSubcontractService.queryById(id));
+    }
+
+
+
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java
index 91df40e9..8c301bd5 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java
@@ -7,6 +7,12 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.bo.XzdPurchaseContractSuspendBo;
+import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.vo.XzdPurchaseContractSuspendVo;
+import org.dromara.xzd.contractManagement.caigoucontractTermination.service.IXzdPurchaseContractSuspendService;
+import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.bo.XzdPurchaseContractAlterationBo;
+import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.vo.XzdPurchaseContractAlterationVo;
+import org.dromara.xzd.contractManagement.caigouhetongbiangeng.service.IXzdPurchaseContractAlterationService;
 import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdJdztVo;
 import org.dromara.xzd.contractManagement.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo;
 import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdJdztCghtVo;
@@ -15,6 +21,7 @@ import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchas
 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.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -45,6 +52,55 @@ public class XzdPurchaseContractInformationController extends BaseController {
 
     private final IXzdBusinessSealService xzdBusinessSealService;
 
+    @Lazy
+    private final IXzdPurchaseContractAlterationService xzdPurchaseContractAlterationService;
+
+
+    @Lazy
+    private final IXzdPurchaseContractSuspendService xzdPurchaseContractSuspendService;
+
+
+    /**
+     * 获取采购合同终止详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value={"contractManagement:purchaseContractInformation:list","contractManagement:purchaseContractInformation:add","contractManagement:purchaseContractInformation:edit"}, mode = SaMode.OR)
+    @GetMapping("/zz/{id}")
+    public R<XzdPurchaseContractSuspendVo> getInfozz(@NotNull(message = "主键不能为空")
+                                                   @PathVariable Long id) {
+        return R.ok(xzdPurchaseContractSuspendService.queryById(id));
+    }
+
+    /**
+     * 查询采购合同终止列表
+     */
+    @SaCheckPermission(value={"contractManagement:purchaseContractInformation:list","contractManagement:purchaseContractInformation:add","contractManagement:purchaseContractInformation:edit"}, mode = SaMode.OR)
+    @GetMapping("/listzz")
+    public TableDataInfo<XzdPurchaseContractSuspendVo> list(XzdPurchaseContractSuspendBo bo, PageQuery pageQuery) {
+        return xzdPurchaseContractSuspendService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询采购合同变更列表
+     */
+    @SaCheckPermission(value={"contractManagement:purchaseContractInformation:list","contractManagement:purchaseContractInformation:add","contractManagement:purchaseContractInformation:edit"}, mode = SaMode.OR)
+    @GetMapping("/listbg")
+    public TableDataInfo<XzdPurchaseContractAlterationVo> list(XzdPurchaseContractAlterationBo bo, PageQuery pageQuery) {
+        return xzdPurchaseContractAlterationService.queryPageList(bo, pageQuery);
+    }
+    /**
+     * 获取采购合同变更详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value={"contractManagement:purchaseContractInformation:list","contractManagement:purchaseContractInformation:add","contractManagement:purchaseContractInformation:edit"}, mode = SaMode.OR)
+    @GetMapping("/xx/{id}")
+    public R<XzdPurchaseContractAlterationVo> getInfoxx(@NotNull(message = "主键不能为空")
+                                                      @PathVariable Long id) {
+        return R.ok(xzdPurchaseContractAlterationService.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 024bd997..5450fce7 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
@@ -43,6 +43,10 @@ public class XzdContractDetailsController extends BaseController {
     private final IXzdContractChangeService xzdContractChangeService;
     private final IXzdContractTerminationService xzdContractTerminationService;
 
+
+
+
+
     /**
      * 查询承包合同信息列表
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdCorrespondentList.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdCorrespondentList.java
index e6b34d31..ca788050 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdCorrespondentList.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdCorrespondentList.java
@@ -11,8 +11,11 @@ import org.dromara.xzd.domain.dto.XzdClienteleListDto;
 import org.dromara.xzd.domain.vo.XzdClienteleListSumVo;
 import org.dromara.xzd.domain.vo.XzdCustomertypeVo;
 import org.dromara.xzd.domain.vo.XzdPoiAreaVo;
+import org.dromara.xzd.domain.vo.XzdProjectVo;
 import org.dromara.xzd.service.IXzdCorrespondentList;
 import org.dromara.xzd.service.IXzdCustomertypeService;
+import org.dromara.xzd.service.IXzdProjectService;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,6 +35,9 @@ public class XzdCorrespondentList {
 
     private final IXzdCustomertypeService iXzdCustomertypeService;
 
+
+
+
     /**
      * 查询区域列表
      */
@@ -51,6 +57,9 @@ public class XzdCorrespondentList {
     }
 
 
+
+
+
     /**
      * 客户信息修改
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java
index 04241540..265ba3bd 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java
@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.annotation.TranslationType;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.xzd.domain.XzdProject;
 
@@ -125,6 +126,7 @@ public class XzdProjectVo implements Serializable {
     /**
      * 管理组织名
      */
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "managementOrganization")
     private String managementOrganizationName;
 
     /**
@@ -158,6 +160,8 @@ public class XzdProjectVo implements Serializable {
     @ExcelProperty(value = "项目责任人")
     private Long managerResponsible;
 
+
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "managerResponsible")
     private String managerResponsibleName;
 
     /**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/publicUrl/XzdPublicUrlConreoller.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/publicUrl/XzdPublicUrlConreoller.java
index 0a2f6ce4..e07e11b0 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/publicUrl/XzdPublicUrlConreoller.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/publicUrl/XzdPublicUrlConreoller.java
@@ -2,6 +2,8 @@ package org.dromara.xzd.publicUrl;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -14,20 +16,17 @@ import org.dromara.system.service.ISysUserService;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.dto.QuerBiddingManagementDto;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QueryListXzdVo;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService;
+import org.dromara.xzd.domain.bo.XzdBusinessSealBo;
 import org.dromara.xzd.domain.bo.XzdProjectBo;
 import org.dromara.xzd.domain.bo.XzdSupplierInfoBo;
 import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo;
 import org.dromara.xzd.domain.dto.XzdClienteleListDto;
-import org.dromara.xzd.domain.vo.XzdClienteleListSumVo;
-import org.dromara.xzd.domain.vo.XzdProjectVo;
-import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
-import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo;
-import org.dromara.xzd.service.IXzdCorrespondentList;
-import org.dromara.xzd.service.IXzdProjectService;
-import org.dromara.xzd.service.IXzdSupplierInfoService;
-import org.dromara.xzd.service.IXzdSupplierOpenBankService;
+import org.dromara.xzd.domain.vo.*;
+import org.dromara.xzd.service.*;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -60,6 +59,11 @@ public class XzdPublicUrlConreoller {
 
     private final ISysDeptService iSysDeptService;
 
+    private final IXzdBusinessSealService xzdBusinessSealService;
+
+
+
+
 
     /**
      * 查询项目信息列表
@@ -107,22 +111,54 @@ public class XzdPublicUrlConreoller {
     }
 
 
-    //    /**
-//     * 获取用户列表
-//     */
+    /**
+     * 获取用户列表
+     */
     @GetMapping("/userList")
     public TableDataInfo<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
         return userService.selectPageUserList(user, pageQuery);
     }
 
 
-//    /**
-//     * 查询部门
-//     */
+    /**
+     * 查询部门
+     */
     @GetMapping("/listDept")
     public R<List<SysDeptVo>> list() {
         List<SysDeptVo> list = iSysDeptService.querListDept();
         return R.ok(list);
     }
 
+    /**
+     * 获取供应商信息详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/xzdSupplier/{id}")
+    public R<XzdSupplierInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                        @PathVariable Long id) {
+        return R.ok(xzdSupplierInfoService.queryById(id));
+    }
+
+
+    /**
+     * 查询印章帮助列表
+     */
+    @GetMapping("/listBusinss")
+    public TableDataInfo<XzdBusinessSealVo> list(XzdBusinessSealBo bo, PageQuery pageQuery) {
+        return xzdBusinessSealService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 项目信息查询
+     */
+    @GetMapping("/xmxx/{id}")
+    public R<List<XzdProjectVo>> getXmxx( @PathVariable Long id) {
+        return R.ok(xzdProjectService.getXmxx(id));
+    }
+
+
+
+
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdProjectService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdProjectService.java
index 95f8f5f9..d6a04e65 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdProjectService.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdProjectService.java
@@ -1,5 +1,6 @@
 package org.dromara.xzd.service;
 
+import org.dromara.common.core.domain.R;
 import org.dromara.xzd.domain.vo.XzdProjectVo;
 import org.dromara.xzd.domain.bo.XzdProjectBo;
 import org.dromara.xzd.domain.XzdProject;
@@ -69,4 +70,12 @@ public interface IXzdProjectService extends IService<XzdProject>{
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     String queryNameById(Long projectId);
+
+    /**
+     * 查询项目信息
+     *
+     * @param id       主键
+     * @return 项目信息
+     */
+    List<XzdProjectVo> getXmxx(Long id);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java
index 12f578f6..e4d6fe9e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.event.ProcessDeleteEvent;
 import org.dromara.common.core.domain.event.ProcessEvent;
 import org.dromara.common.core.domain.event.ProcessTaskEvent;
@@ -513,6 +514,13 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
         return xzdProject != null ? xzdProject.getProjectName() : "";
     }
 
+    @Override
+    public List<XzdProjectVo> getXmxx(Long id) {
+        List<XzdProjectVo> xzdProjectVos = this.getBaseMapper().selectVoList(new LambdaQueryWrapper<>(new XzdProject()).eq(XzdProject::getConstructionUnit, id));
+
+        return xzdProjectVos;
+    }
+
     public void setValue(XzdProjectVo entity){
         if (entity != null) {
             //项目概况
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 46ac9ddb..dc68670f 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
@@ -65,6 +65,19 @@ public class SettlementOfSubcontractingContractController extends BaseController
         return xzdSubcontractService.queryPageList(bo, pageQuery);
     }
 
+
+    /**
+     * 获取分包合同信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value = {"fenbaohetongjingdu:ofSubcontractingContract:list","fenbaohetongjingdu:ofSubcontractingContract:add","fenbaohetongjingdu:ofSubcontractingContract:edit"},mode = SaMode.OR)
+    @GetMapping("/xx/{id}")
+    public R<XzdSubcontractVo> getInfoxx(@NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(xzdSubcontractService.queryById(id));
+    }
+
     /**
      * 查询分包合同进度结算列表
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java
index c4a20ad3..15f438c1 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java
@@ -65,6 +65,19 @@ public class SettlementOfSubcontractingCompletionController extends BaseControll
         return settlementOfSubcontractingCompletionService.queryPageList(bo, pageQuery);
     }
 
+
+    /**
+     * 获取分包合同信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value = {"fenbaohetongjungong:ofSubcontractingCompletion:list","fenbaohetongjungong:ofSubcontractingCompletion:add","fenbaohetongjungong:ofSubcontractingCompletion:edit"},mode = SaMode.OR)
+    @GetMapping("/xx/{id}")
+    public R<XzdSubcontractVo> getInfoxx(@NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(xzdSubcontractService.queryById(id));
+    }
+
     /**
      * 导出分包合同竣工结算列表
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java
index f4f61818..da7d1984 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java
@@ -57,6 +57,18 @@ public class SettlementOfSubcontractingAdjustmentController extends BaseControll
 //        return xzdSubcontractService.queryPageList(bo, pageQuery);
 //    }
 
+    /**
+     * 获取分包合同竣工结算详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value = {"fenbaohetongtiaozheng:ofSubcontractingAdjustment:list","fenbaohetongtiaozheng:ofSubcontractingAdjustment:add","fenbaohetongtiaozheng:ofSubcontractingAdjustment:edit"},mode = SaMode.OR)
+    @GetMapping("/jg/{id}")
+    public R<SettlementOfSubcontractingCompletionVo> getInfojg(@NotNull(message = "主键不能为空")
+                                                             @PathVariable Long id) {
+        return R.ok(settlementOfSubcontractingCompletionService.queryById(id));
+    }
+
 
     /**
      * 查询分包合同竣工结算列表
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java
index ae90ece4..443d6244 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java
@@ -3,10 +3,20 @@ package org.dromara.xzd.zijinjihua.yueduzijinbiangeng.controller;
 import java.util.List;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 
+import org.dromara.xzd.domain.bo.XzdContractDetailsBo;
+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.zijinjihua.yueduzijinjihua.domain.bo.FinancialRevenueExpenditurePlanBo;
+import org.dromara.xzd.zijinjihua.yueduzijinjihua.domain.vo.FinancialRevenueExpenditurePlanVo;
+import org.dromara.xzd.zijinjihua.yueduzijinjihua.service.IFinancialRevenueExpenditurePlanService;
+import org.hibernate.validator.internal.util.stereotypes.Lazy;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -37,6 +47,66 @@ public class FinancialRevenuePlanAlterationController extends BaseController {
 
     private final IFinancialRevenuePlanAlterationService financialRevenuePlanAlterationService;
 
+    private final IFinancialRevenueExpenditurePlanService financialRevenueExpenditurePlanService;
+
+
+    private final IXzdContractDetailsService xzdContractDetailsService;
+
+
+
+
+    @Lazy
+    private final IXzdProjectService xzdProjectService;
+
+
+
+    /**
+     * 获取项目信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value = {"yueduzijinbiangeng:revenuePlanAlteration:list","yueduzijinbiangeng:revenuePlanAlteration:add","yueduzijinbiangeng:revenuePlanAlteration:edit"}, mode = SaMode.OR)
+    @GetMapping("/getProject/{id}")
+    public R<XzdProjectVo> getProjectInfo(@NotNull(message = "主键不能为空")
+                                          @PathVariable Long id) {
+        return R.ok(xzdProjectService.queryById(id));
+    }
+
+
+
+
+
+    /**
+     * 查询月度资金计划列表
+     */
+    @SaCheckPermission(value = {"yueduzijinbiangeng:revenuePlanAlteration:list","yueduzijinbiangeng:revenuePlanAlteration:add","yueduzijinbiangeng:revenuePlanAlteration:edit"}, mode = SaMode.OR)
+    @GetMapping("/getlist")
+    public TableDataInfo<FinancialRevenueExpenditurePlanVo> list(FinancialRevenueExpenditurePlanBo bo, PageQuery pageQuery) {
+        return financialRevenueExpenditurePlanService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取承包合同信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value = {"yueduzijinbiangeng:revenuePlanAlteration:list","yueduzijinbiangeng:revenuePlanAlteration:add","yueduzijinbiangeng:revenuePlanAlteration:edit"}, mode = SaMode.OR)
+    @GetMapping("/cb/{id}")
+    public R<XzdContractDetailsVo> getInfocb(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(xzdContractDetailsService.queryById(id));
+    }
+
+
+    /**
+     * 查询承包合同信息列表
+     */
+    @SaCheckPermission(value = {"yueduzijinbiangeng:revenuePlanAlteration:list","yueduzijinbiangeng:revenuePlanAlteration:add","yueduzijinbiangeng:revenuePlanAlteration:edit"}, mode = SaMode.OR)
+    @GetMapping("/listcb")
+    public TableDataInfo<XzdContractDetailsVo> list(XzdContractDetailsBo bo, PageQuery pageQuery) {
+        return xzdContractDetailsService.queryPageList(bo, pageQuery);
+    }
+
     /**
      * 查询月度资金计划变更列表
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java
index d4c258c4..7be8459e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java
@@ -2,12 +2,19 @@ package org.dromara.xzd.zijinjihua.yueduzijinjihua.controller;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaMode;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.xzd.domain.bo.XzdContractDetailsBo;
+import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
+import org.dromara.xzd.domain.vo.XzdProjectVo;
+import org.dromara.xzd.service.IXzdContractDetailsService;
+import org.dromara.xzd.service.IXzdProjectService;
 import org.dromara.xzd.zijinjihua.yueduzijinjihua.service.IDetailOfEarningsService;
 import org.dromara.xzd.zijinjihua.yueduzijinjihua.service.IStatementOfExpendituresService;
+import org.hibernate.validator.internal.util.stereotypes.Lazy;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -39,6 +46,55 @@ public class FinancialRevenueExpenditurePlanController extends BaseController {
     private final IFinancialRevenueExpenditurePlanService financialRevenueExpenditurePlanService;
 
 
+    private final IXzdContractDetailsService xzdContractDetailsService;
+
+
+
+
+    @Lazy
+    private final IXzdProjectService xzdProjectService;
+
+
+
+    /**
+     * 获取项目信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value = {"yueduzijinjihua:revenueExpenditurePlan:list","yueduzijinjihua:revenueExpenditurePlan:add","yueduzijinjihua:revenueExpenditurePlan:edit"}, mode = SaMode.OR)
+    @GetMapping("/getProject/{id}")
+    public R<XzdProjectVo> getProjectInfo(@NotNull(message = "主键不能为空")
+                                          @PathVariable Long id) {
+        return R.ok(xzdProjectService.queryById(id));
+    }
+
+
+
+    /**
+     * 获取承包合同信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value = {"yueduzijinjihua:revenueExpenditurePlan:list","yueduzijinjihua:revenueExpenditurePlan:add","yueduzijinjihua:revenueExpenditurePlan:edit"}, mode = SaMode.OR)
+    @GetMapping("/cb/{id}")
+    public R<XzdContractDetailsVo> getInfocb(@NotNull(message = "主键不能为空")
+                                           @PathVariable Long id) {
+        return R.ok(xzdContractDetailsService.queryById(id));
+    }
+
+
+    /**
+     * 查询承包合同信息列表
+     */
+    @SaCheckPermission(value = {"yueduzijinjihua:revenueExpenditurePlan:list","yueduzijinjihua:revenueExpenditurePlan:add","yueduzijinjihua:revenueExpenditurePlan:edit"}, mode = SaMode.OR)
+    @GetMapping("/listcb")
+    public TableDataInfo<XzdContractDetailsVo> list(XzdContractDetailsBo bo, PageQuery pageQuery) {
+        return xzdContractDetailsService.queryPageList(bo, pageQuery);
+    }
+
+
+
+
     /**
      * 查询月度资金计划列表
      */