From 20574d003775f17cad52ac138fb86df73eac6f85 Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 23 Oct 2025 11:25:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 4 ++++ .../domain/XzdPurchaseContractAlteration.java | 7 ++++++- .../bo/XzdPurchaseContractAlterationBo.java | 7 ++++++- .../vo/XzdPurchaseContractAlterationVo.java | 20 ++++++++++++++++++- ...PurchaseContractAlterationServiceImpl.java | 9 +++++++++ .../domain/XzdSubcontractChange.java | 5 +++++ .../domain/bo/XzdSubcontractChangeBo.java | 4 ++++ .../domain/vo/XzdSubcontractChangeVo.java | 5 +++++ .../domain/XzdSubcontract.java | 5 +++++ .../domain/bo/XzdSubcontractBo.java | 5 +++++ .../domain/vo/XzdSubcontractVo.java | 5 +++++ .../XzdPurchaseContractInformation.java | 5 +++++ .../bo/XzdPurchaseContractInformationBo.java | 5 +++++ .../vo/XzdPurchaseContractInformationVo.java | 5 +++++ ...urchaseContractInformationServiceImpl.java | 2 ++ 15 files changed, 90 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 93cef785..f02d2f9a 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -308,6 +308,10 @@ xss: - /xzd/contractChange/** - /comprehensive/csContractChange - /comprehensive/csContractInformation + - /hetongbiangeng/** + - /fenbaohetongbiangg/** + - /fenbaohetongxinxi/** + - /contractManagement/** # 全局线程池相关配置 # 如使用JDK21请直接使用虚拟线程 不要开启此配置 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/XzdPurchaseContractAlteration.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/XzdPurchaseContractAlteration.java index 6bf74f63..abbcfca2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/XzdPurchaseContractAlteration.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/XzdPurchaseContractAlteration.java @@ -149,7 +149,7 @@ public class XzdPurchaseContractAlteration extends BaseEntity { /** * 变更后合同备注 */ - private Long changeContractRemarks; + private String changeContractRemarks; /** * 项目大类 @@ -211,6 +211,11 @@ public class XzdPurchaseContractAlteration extends BaseEntity { private String auditStatus; + /** + * 合同文本 + */ + private String contractText; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/bo/XzdPurchaseContractAlterationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/bo/XzdPurchaseContractAlterationBo.java index 53b94557..6fd6b86f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/bo/XzdPurchaseContractAlterationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/bo/XzdPurchaseContractAlterationBo.java @@ -154,7 +154,7 @@ public class XzdPurchaseContractAlterationBo extends BaseEntity { /** * 变更后合同备注 */ - private Long changeContractRemarks; + private String changeContractRemarks; /** * 项目大类 @@ -220,6 +220,11 @@ public class XzdPurchaseContractAlterationBo extends BaseEntity { private LocalDate endDate; + /** + * 合同文本 + */ + private String contractText; + /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java index b80b20f3..016f3152 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java @@ -53,6 +53,13 @@ public class XzdPurchaseContractAlterationVo implements Serializable { @ExcelDictFormat(readConverterExp = "合=同编码") private Long contractInformationId; + /** + * 采购合同信息ID（合同编码） + */ + @ExcelProperty(value = "采购合同信息ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "合=同编码") + private String contractInformationName; + /** * 单据编码 */ @@ -223,7 +230,7 @@ public class XzdPurchaseContractAlterationVo implements Serializable { * 变更后现场经理 */ @ExcelProperty(value = "变更后合同备注") - private Long changeContractRemarks; + private String changeContractRemarks; /** * 项目大类 @@ -304,11 +311,22 @@ public class XzdPurchaseContractAlterationVo implements Serializable { @ExcelProperty(value = "审核状态") private String auditStatus; + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + /** * 变更价税合计 */ private String changeInTotalAmount; + /** + * 合同文本 + */ + private String contractText; + /** * 变更后价税合计 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java index b998bd55..11a5b928 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java @@ -111,6 +111,14 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -162,6 +170,7 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl queryPageList(XzdPurchaseContractAlterationBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + setValue(result.getRecords()); return TableDataInfo.build(result); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/XzdSubcontractChange.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/XzdSubcontractChange.java index 277895ff..3b6c731f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/XzdSubcontractChange.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/XzdSubcontractChange.java @@ -44,6 +44,11 @@ public class XzdSubcontractChange extends BaseEntity { */ private LocalDate documentDate; + /** + * 合同文本 + */ + private String contractText; + /** * 合同编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java index 43b2064e..52b6beb6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java @@ -68,6 +68,10 @@ public class XzdSubcontractChangeBo extends BaseEntity { */ private String changeType; + /** + * 合同文本 + */ + private String contractText; /** * 项目 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java index 3b9aab1d..39d54cea 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java @@ -64,6 +64,11 @@ public class XzdSubcontractChangeVo implements Serializable { @ExcelProperty(value = "单据日期") private LocalDate documentDate; + /** + * 合同文本 + */ + private String contractText; + /** * 合同编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java index d38fb085..00bc7a53 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java @@ -58,6 +58,11 @@ public class XzdSubcontract extends BaseEntity { */ private String businessModel; + /** + * 合同文本 + */ + private String contractText; + /** * 原合同造价 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java index e2d7654a..235f21bc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java @@ -58,6 +58,11 @@ public class XzdSubcontractBo extends BaseEntity { */ private Long project; + + /** + * 合同文本 + */ + private String contractText; /** * 经营模式 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java index 05197530..2d97b268 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java @@ -69,6 +69,11 @@ public class XzdSubcontractVo implements Serializable { @ExcelProperty(value = "合同类型") private String contractType; + /** + * 合同文本 + */ + private String contractText; + /** * 项目 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java index ccaf8921..665d08ca 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java @@ -126,6 +126,11 @@ public class XzdPurchaseContractInformation extends BaseEntity { */ private String paymentTerms; + /** + * 合同文本 + */ + private String contractText; + /** * 集采模式 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java index a2953ef0..e250497b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java @@ -317,6 +317,11 @@ public class XzdPurchaseContractInformationBo extends BaseEntity { */ private List htbgqds; + /** + * 合同文本 + */ + private String contractText; + /** * 汇总数据 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java index 5e5fa08c..a2d23a68 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java @@ -58,6 +58,11 @@ public class XzdPurchaseContractInformationVo implements Serializable { @ExcelProperty(value = "合同名称") private String contractName; + /** + * 合同文本 + */ + private String contractText; + /** * 单据日期 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java index fd880490..31680183 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java @@ -108,6 +108,8 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl Date: Thu, 23 Oct 2025 11:28:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xinnengyuan/ruoyi-admin/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index f02d2f9a..d01e28e5 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -306,8 +306,8 @@ xss: - /project/project - /xzd/contractDetails/** - /xzd/contractChange/** - - /comprehensive/csContractChange - - /comprehensive/csContractInformation + - /comprehensive/csContractChange/** + - /comprehensive/csContractInformation/** - /hetongbiangeng/** - /fenbaohetongbiangg/** - /fenbaohetongxinxi/**