diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml
index 94f67ee..8da2669 100644
--- a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml
@@ -34,8 +34,10 @@ feeName.name
+
-
+
+
@@ -58,6 +60,7 @@ feeName.name
fee.invoiceType,
fee.description,
fee.paymentDate,
+ TO_CHAR(fee.presidentDate, 'YYYY-MM-DD'),
fee.creatPeople,
fee.creatDate,
'FEE',
@@ -84,6 +87,8 @@ feeName.name
/~end1: AND trunc(fee.paymentDate) <= {end1} ~/
/~begin2: AND trunc(fee.creatDate) >= {begin2} ~/
/~end2: AND trunc(fee.creatDate) <= {end2} ~/
+ /~begin3: AND trunc(fee.presidentDate) >= {begin3} ~/
+ /~end3: AND trunc(fee.presidentDate) <= {end3} ~/
order by fee.billCode desc
]]>
@@ -105,6 +110,7 @@ feeName.name
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml
index 4a835ee..a3767e4 100644
--- a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml
@@ -34,8 +34,9 @@ feeName.name
+
-
+
@@ -58,6 +59,7 @@ feeName.name
fee.invoiceType,
fee.description,
fee.paymentDate,
+ TO_CHAR(fee.presidentDate, 'YYYY-MM-DD'),
fee.creatPeople,
fee.creatDate,
'FEE',
@@ -84,6 +86,8 @@ feeName.name
/~end1: AND trunc(fee.paymentDate) <= {end1} ~/
/~begin2: AND trunc(fee.creatDate) >= {begin2} ~/
/~end2: AND trunc(fee.creatDate) <= {end2} ~/
+ /~begin3: AND trunc(fee.presidentDate) >= {begin3} ~/
+ /~end3: AND trunc(fee.presidentDate) <= {end3} ~/
order by fee.billCode desc
]]>
@@ -105,6 +109,7 @@ feeName.name
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
index d697b17..7744ced 100644
--- a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
@@ -34,8 +34,9 @@ feeName.name
+
-
+
@@ -58,6 +59,7 @@ feeName.name
fee.invoiceType,
fee.description,
fee.paymentDate,
+ TO_CHAR(fee.presidentDate, 'YYYY-MM-DD'),
fee.creatPeople,
fee.creatDate,
'FEE',
@@ -82,6 +84,8 @@ feeName.name
/~end1: AND trunc(fee.paymentDate) <= {end1} ~/
/~begin2: AND trunc(fee.creatDate) >= {begin2} ~/
/~end2: AND trunc(fee.creatDate) <= {end2} ~/
+ /~begin3: AND trunc(fee.presidentDate) >= {begin3} ~/
+ /~end3: AND trunc(fee.presidentDate) <= {end3} ~/
order by fee.billCode desc
]]>
@@ -103,6 +107,7 @@ feeName.name
+
diff --git a/target/jjwms/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml b/target/jjwms/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
deleted file mode 100644
index d697b17..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- = {begin1} ~/
- /~end1: AND trunc(fee.paymentDate) <= {end1} ~/
- /~begin2: AND trunc(fee.creatDate) >= {begin2} ~/
- /~end2: AND trunc(fee.creatDate) <= {end2} ~/
- order by fee.billCode desc
- ]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-