From 30c9db3769f343b219fff3a57d48eef0800b7a66 Mon Sep 17 00:00:00 2001
From: xiaoshi <2272816786@qq.com>
Date: Mon, 7 Jul 2025 09:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java   | 6 +++---
 .../zcdev/pr/plugin/operate/ContractPublicValidator.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java
index d07232f..aa8cb6b 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java
@@ -42,10 +42,10 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin
                 comboList.add(new ComboItem(new LocaleString("全部租赁"), "C"));
                 comboList.add(new ComboItem(new LocaleString("部分租赁"), "D"));
                 comboList.add(new ComboItem(new LocaleString("零星租赁"), "F"));
-                comboList1.add(new ComboItem(new LocaleString("固定单价"), "gddj"));
+                comboList1.add(new ComboItem(new LocaleString("综合单价"), "gddj"));
                 comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
             } else if (number.equals("ZCHLX02") ||number.equals("wzcg01")) {
-                comboList1.add(new ComboItem(new LocaleString("固定单价"), "gddj"));
+                comboList1.add(new ComboItem(new LocaleString("综合单价"), "gddj"));
                 comboList1.add(new ComboItem(new LocaleString("不定量不定价"), "bdlbdj"));
                 comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
                 comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));
@@ -57,7 +57,7 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin
                     }
                 }
             } else{
-                comboList1.add(new ComboItem(new LocaleString("固定单价"), "gddj"));
+                comboList1.add(new ComboItem(new LocaleString("综合单价"), "gddj"));
                 comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
                 comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
                 comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/ContractPublicValidator.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/ContractPublicValidator.java
index 3c7973f..a46849d 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/ContractPublicValidator.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/ContractPublicValidator.java
@@ -21,7 +21,7 @@ public class ContractPublicValidator extends AbstractValidator {
                     for (DynamicObject object : modelEntries) {
                         DynamicObjectCollection listingEntries = object.getDynamicObjectCollection("sublistentry");
                         if (listingEntries.size()==0){
-                            this.addErrorMessage(dataEntity, "“计价方式”为“固定单价”时“合同清单”不能为空！");
+                            this.addErrorMessage(dataEntity, "“计价方式”为“综合单价”时“合同清单”不能为空！");
                         }else{
                             for (int i = 0; i < listingEntries.size(); i++) {
                                 DynamicObject listingEntrie = listingEntries.get(i);