From 02196463f677e7006d93bc5d5729d6707ad283a1 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Fri, 25 Apr 2025 14:47:02 +0800
Subject: [PATCH] no message

---
 .../config/origen/fee/maintainCDBillFeePayPage.xml | 14 +++++++++++++-
 .../config/origen/fee/maintainCDBillFeePayPage.xml | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/webapp/WEB-INF/classes/config/origen/fee/maintainCDBillFeePayPage.xml b/src/webapp/WEB-INF/classes/config/origen/fee/maintainCDBillFeePayPage.xml
index 7598659..694627b 100644
--- a/src/webapp/WEB-INF/classes/config/origen/fee/maintainCDBillFeePayPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/fee/maintainCDBillFeePayPage.xml
@@ -13,7 +13,17 @@
 		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"/>
 
             <checkbox id="ordersAll" title="ordersAll" row="16" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
             </inputUIs>
@@ -41,6 +51,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/maintainCDBillFeePayPage.xml b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainCDBillFeePayPage.xml
index 7598659..694627b 100644
--- a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainCDBillFeePayPage.xml
+++ b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainCDBillFeePayPage.xml
@@ -13,7 +13,17 @@
 		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"/>
 
             <checkbox id="ordersAll" title="ordersAll" row="16" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
             </inputUIs>
@@ -41,6 +51,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>