From 7be25901d594664be88fb39a97957f059abbcc0c Mon Sep 17 00:00:00 2001
From: "huojin\\hj" <982011>
Date: Tue, 27 May 2025 16:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=AF=E4=BB=98=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 cf7b0d6..3a81c31 100644
--- a/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
@@ -19,6 +19,8 @@
   where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','VERIFICATION')
   order by enumerate.id]]></hql>
                 </list>
+                <dateRanger id="invoice.issuingDate" title="applyBill.invoiceDate1" row="4" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
+			   
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[ SELECT 
@@ -51,6 +53,8 @@
 /~invoiceCompany.companyName: AND invoiceCompany.companyName like {invoiceCompany.companyName}~/
 /~applyBill.invoiceType: AND applyBill.invoiceType = {applyBill.invoiceType}~/
  /~invoice.invoiceState: and invoice.invoiceState = {invoice.invoiceState} ~/
+  /~startDate: AND (invoice.issuingDate) >= {startDate}~/
+ /~endDate: AND (invoice.issuingDate) <= {endDate}~/
  ]]></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/maintainApplyBillDetailPayPage.xml b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
index cf7b0d6..3a81c31 100644
--- a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
+++ b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
@@ -19,6 +19,8 @@
   where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','VERIFICATION')
   order by enumerate.id]]></hql>
                 </list>
+                <dateRanger id="invoice.issuingDate" title="applyBill.invoiceDate1" row="4" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
+			   
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[ SELECT 
@@ -51,6 +53,8 @@
 /~invoiceCompany.companyName: AND invoiceCompany.companyName like {invoiceCompany.companyName}~/
 /~applyBill.invoiceType: AND applyBill.invoiceType = {applyBill.invoiceType}~/
  /~invoice.invoiceState: and invoice.invoiceState = {invoice.invoiceState} ~/
+  /~startDate: AND (invoice.issuingDate) >= {startDate}~/
+ /~endDate: AND (invoice.issuingDate) <= {endDate}~/
  ]]></datasource>
         <columns>
             <column id="invoice.id" title="invoice.id" visible="false" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>