From 07111499c63fa3690146862849836e2219c6914e Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Sun, 27 Apr 2025 14:13:28 +0800
Subject: [PATCH] no message

---
 .../config/origen/fee/maintainAddBillPayPage.xml    | 13 ++++++++++++-
 .../origen/fee/maintainApplyBillDetailPayPage.xml   |  8 ++++++++
 .../config/origen/fee/maintainAddBillPayPage.xml    | 13 ++++++++++++-
 .../origen/fee/maintainApplyBillDetailPayPage.xml   |  8 ++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/webapp/WEB-INF/classes/config/origen/fee/maintainAddBillPayPage.xml b/src/webapp/WEB-INF/classes/config/origen/fee/maintainAddBillPayPage.xml
index 0b2a574..a6ba6e8 100644
--- a/src/webapp/WEB-INF/classes/config/origen/fee/maintainAddBillPayPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/fee/maintainAddBillPayPage.xml
@@ -13,7 +13,16 @@
 		or company.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
  and company.disabled=false]]></hql>
               	</remote>
-              	<text id="billFee.month" title="billFee.month" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
+              	<list id="billFee.status" title="billFee.status" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="FeeStatus">
+                    <hql><![CDATA[  SELECT 
+  enumerate.enumValue,
+  enumerate.enumValue From Enumerate enumerate 
+  where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','BILL_CHECK')
+  order by enumerate.id]]></hql>
+                </list>
+                <numberText id="billFee.totalFee" title="billFee.totalFee" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="0" />
+              	
+              	<text id="billFee.month" title="billFee.month" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[ SELECT 
@@ -43,6 +52,8 @@
  /~billFee.code: AND billFee.code like {billFee.code}~/
  /~account.id: AND billFee.account.id = {account.id}~/
  /~billFee.month: AND billFee.month like {billFee.month}~/
+ /~billFee.status: and billFee.status = {billFee.status} ~/
+ /~billFee.totalFee: and billFee.totalFee = {billFee.totalFee} ~/
   order by billFee.id desc 
  ]]></datasource>
         <columns>
diff --git a/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml b/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
index c822347..cf7b0d6 100644
--- a/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
@@ -12,6 +12,13 @@
  FROM Enumerate t 
  WHERE t.enumType = 'InvoiceType'  and t.enumValue in ('ORDINARY','DEDICATED')]]></hql>
             </list>
+            <list id="invoice.invoiceState" title="ABD.statu" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="FeeStatus">
+                    <hql><![CDATA[  SELECT 
+  enumerate.enumValue,
+  enumerate.enumValue From Enumerate enumerate 
+  where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','VERIFICATION')
+  order by enumerate.id]]></hql>
+                </list>
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[ SELECT 
@@ -43,6 +50,7 @@
 /~ABD.invoiceNo: AND ABD.invoiceNo like upper({ABD.invoiceNo})~/
 /~invoiceCompany.companyName: AND invoiceCompany.companyName like {invoiceCompany.companyName}~/
 /~applyBill.invoiceType: AND applyBill.invoiceType = {applyBill.invoiceType}~/
+ /~invoice.invoiceState: and invoice.invoiceState = {invoice.invoiceState} ~/
  ]]></datasource>
         <columns>
             <column id="invoice.id" title="invoice.id" visible="false" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainAddBillPayPage.xml b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainAddBillPayPage.xml
index 0b2a574..a6ba6e8 100644
--- a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainAddBillPayPage.xml
+++ b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainAddBillPayPage.xml
@@ -13,7 +13,16 @@
 		or company.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
  and company.disabled=false]]></hql>
               	</remote>
-              	<text id="billFee.month" title="billFee.month" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
+              	<list id="billFee.status" title="billFee.status" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="FeeStatus">
+                    <hql><![CDATA[  SELECT 
+  enumerate.enumValue,
+  enumerate.enumValue From Enumerate enumerate 
+  where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','BILL_CHECK')
+  order by enumerate.id]]></hql>
+                </list>
+                <numberText id="billFee.totalFee" title="billFee.totalFee" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="0" />
+              	
+              	<text id="billFee.month" title="billFee.month" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[ SELECT 
@@ -43,6 +52,8 @@
  /~billFee.code: AND billFee.code like {billFee.code}~/
  /~account.id: AND billFee.account.id = {account.id}~/
  /~billFee.month: AND billFee.month like {billFee.month}~/
+ /~billFee.status: and billFee.status = {billFee.status} ~/
+ /~billFee.totalFee: and billFee.totalFee = {billFee.totalFee} ~/
   order by billFee.id desc 
  ]]></datasource>
         <columns>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
index c822347..cf7b0d6 100644
--- a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
+++ b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
@@ -12,6 +12,13 @@
  FROM Enumerate t 
  WHERE t.enumType = 'InvoiceType'  and t.enumValue in ('ORDINARY','DEDICATED')]]></hql>
             </list>
+            <list id="invoice.invoiceState" title="ABD.statu" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="FeeStatus">
+                    <hql><![CDATA[  SELECT 
+  enumerate.enumValue,
+  enumerate.enumValue From Enumerate enumerate 
+  where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','VERIFICATION')
+  order by enumerate.id]]></hql>
+                </list>
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[ SELECT 
@@ -43,6 +50,7 @@
 /~ABD.invoiceNo: AND ABD.invoiceNo like upper({ABD.invoiceNo})~/
 /~invoiceCompany.companyName: AND invoiceCompany.companyName like {invoiceCompany.companyName}~/
 /~applyBill.invoiceType: AND applyBill.invoiceType = {applyBill.invoiceType}~/
+ /~invoice.invoiceState: and invoice.invoiceState = {invoice.invoiceState} ~/
  ]]></datasource>
         <columns>
             <column id="invoice.id" title="invoice.id" visible="false" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>