From 901c8785fe6d0e13ec1ddba353dadde22fc9f9ce Mon Sep 17 00:00:00 2001 From: lg Date: Mon, 20 Oct 2025 15:30:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzd/settlement/domain/XzdAlterationInventory.java | 5 +++++ .../xzd/settlement/domain/bo/XzdAlterationInventoryBo.java | 5 +++++ .../xzd/settlement/domain/vo/XzdAlterationInventoryVo.java | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java index 94c26d43..131cbeaf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java @@ -40,6 +40,11 @@ public class XzdAlterationInventory extends BaseEntity { */ private String code; + /** + * 合同类型（1、承包合同，2、分包合同，3、采购合同，4综合服务合同） + */ + private String contractType; + /** * 合同清单名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java index cf133a38..c2458554 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java @@ -44,6 +44,11 @@ public class XzdAlterationInventoryBo extends BaseEntity { */ private String contractListName; + /** + * 合同类型（1、承包合同，2、分包合同，3、采购合同，4综合服务合同） + */ + private String contractType; + /** * 项目名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java index 9ed06e24..00b346e4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java @@ -94,8 +94,12 @@ public class XzdAlterationInventoryVo implements Serializable { * 含税单价 */ @ExcelProperty(value = "含税单价") - private BigDecimal taxInclusiveUnitPrice; + + /** + * 合同类型（1、承包合同，2、分包合同，3、采购合同，4综合服务合同） + */ + private String contractType; /** * 本期结算数量 */