From 3c6f6c1e3016e38146a4c46be6e7b625c35591f2 Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期四, 18 十二月 2025 11:49:18 +0800
Subject: [PATCH] 1、添加报表 2、修改添加报表报错
---
src/main/webapp/WEB-INF/ureportfiles/test.ureport.xml | 3
src/main/webapp/WEB-INF/ureportfiles/catAjjxx_ledger_ureport.xml | 10 ++
src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport.xml | 23 ++++
src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport 2.xml | 16 +++
src/main/webapp/WEB-INF/ureportfiles/utilization_user_ureport.xml | 3
src/main/webapp/WEB-INF/ureportfiles/catCgxx_tj.ureport.xml | 3
src/main/webapp/WEB-INF/ureportfiles/catAjjxx_formingUnitStatistics.ureport.xml | 17 +++
src/main/webapp/WEB-INF/ureportfiles/catCgxx_original_ureport.xml | 3
src/main/webapp/WEB-INF/ureportfiles/processing_approval_hn.ureport.xml | 20 ++++
src/main/resources/mapper/ReportMapper.xml | 2
src/main/webapp/WEB-INF/ureportfiles/catAjjxx_hjqktj.ureport.xml | 19 +++
src/main/webapp/WEB-INF/ureportfiles/catAjjxx_confluence_ureport.xml | 6 +
src/main/webapp/WEB-INF/ureportfiles/borrow_approval_gh.ureport.xml | 13 ++
src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp | 99 +++++++++----------
src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp | 23 ++--
src/main/webapp/WEB-INF/ureportfiles/borrowing_approval_form.ureport.xml | 7 +
16 files changed, 204 insertions(+), 63 deletions(-)
diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml
index bb9b299..beeb01c 100644
--- a/src/main/resources/mapper/ReportMapper.xml
+++ b/src/main/resources/mapper/ReportMapper.xml
@@ -4,7 +4,7 @@
<!-- 鑾峰彇鏈�澶ф帓搴忓彿 -->
<select id="selectMaxSortNum" parameterType="Long" resultType="int">
- select ifnull(max(sort_num), 0) sortNum
+ select NVL(max(sort_num), 0) sortNum
FROM cnf_report
where module_id = #{moduleId}
</select>
diff --git a/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_gh.ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_gh.ureport.xml
new file mode 100644
index 0000000..f3875af
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_gh.ureport.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" col-span="13"><cell-style font-size="14" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"></cell-style><simple-value><![CDATA[鏍峰搧鏈嶅姟鐢宠琛╙]></simple-value></cell><cell expand="None" name="A2" row="2" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜�
+]]></simple-value></cell><cell expand="None" name="D2" row="2" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="APPLY_USER" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G2" row="2" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鑱旂郴鏂瑰紡]]></simple-value></cell><cell expand="None" name="I2" row="2" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="TEL_NUMBER" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A3" row="3" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎵�鍦ㄩ儴闂╙]></simple-value></cell><cell expand="None" name="D3" row="3" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="DEPT_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G3" row="3" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[棰勭害鏃舵
+]]></simple-value></cell><cell expand="None" name="I3" row="3" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="OBSERVATION_TIME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A4" row="4" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍒╃敤鏂瑰紡锛歖]></simple-value></cell><cell expand="None" name="D4" row="4" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A5" row="5" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏍峰搧鎵�灞為」鐩細]]></simple-value></cell><cell expand="None" name="D5" row="5" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="PROJECT_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A6" row="6" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠鐢ㄩ�斿強鎴愭晥]]></simple-value></cell><cell expand="None" name="D6" row="6" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="RESEARCH_PURPOSE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A7" row="7" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏍峰搧绫诲瀷]]></simple-value></cell><cell expand="None" name="D7" row="7" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎵�灞炴捣鍩�
+鎴栬埅娆�
+]]></simple-value></cell><cell expand="None" name="G7" row="7" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绔欎綅]]></simple-value></cell><cell expand="None" name="H7" row="7" col="8" col-span="6"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍙栨牱鎴栬祫鏂欏鍒惰姹俔]></simple-value></cell><cell expand="Down" name="A8" row="8" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="SAMPLE_TYPE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="D8" row="8" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="VESSEL_VOYAGE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="G8" row="8" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="POSITION" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="H8" row="8" col="8" col-span="6"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A9" row="9" col="1" row-span="3" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[椤圭洰璐熻矗浜烘剰瑙乚]></simple-value></cell><cell expand="None" name="D9" row="9" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="G9" row="9" col="7" row-span="3" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠閮ㄩ棬鎰忚]]></simple-value></cell><cell expand="None" name="I9" row="9" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="D10" row="10" col="4"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[璐熻矗浜猴細]]></simple-value></cell><cell expand="None" name="E10" row="10" col="5" col-span="2"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="I10" row="10" col="9" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[璐熻矗浜猴細]]></simple-value></cell><cell expand="None" name="K10" row="10" col="11" col-span="3"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="D11" row="11" col="4"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="E11" row="11" col="5" col-span="2"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[骞� 鏈� 鏃]></simple-value></cell><cell expand="None" name="I11" row="11" col="9" col-span="2"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="K11" row="11" col="11" col-span="3"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[骞� 鏈� 鏃]></simple-value></cell><cell expand="None" name="A12" row="12" col="1" row-span="5" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[褰掑彛绠$悊
+閮ㄩ棬鎰忚
+锛堜繚鎶ゆ湡鍐呮牱鍝侊級
+]]></simple-value></cell><cell expand="None" name="D12" row="12" col="4" row-span="3" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="D15" row="15" col="4"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="E15" row="15" col="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="F15" row="15" col="6"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="G15" row="15" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="H15" row="15" col="8" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[璐熻矗浜猴細]]></simple-value></cell><cell expand="None" name="K15" row="15" col="11" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="D16" row="16" col="4"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="E16" row="16" col="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="F16" row="16" col="6"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="G16" row="16" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="H16" row="16" col="8"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="I16" row="16" col="9"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="J16" row="16" col="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="K16" row="16" col="11" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[骞� 鏈� 鏃]></simple-value></cell><cell expand="None" name="A17" row="17" col="1" row-span="3" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[娴锋磱瀹炵墿璧勬枡鎵�
+鎰忚]]></simple-value></cell><cell expand="None" name="D17" row="17" col="4" col-span="10"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="D18" row="18" col="4" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="F18" row="18" col="6" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="H18" row="18" col="8" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[璐熻矗浜猴細]]></simple-value></cell><cell expand="None" name="K18" row="18" col="11" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="D19" row="19" col="4" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="F19" row="19" col="6" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="H19" row="19" col="8"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="I19" row="19" col="9"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="J19" row="19" col="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="K19" row="19" col="11" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[骞� 鏈� 鏃]></simple-value></cell><row row-number="1" height="26" band="title"/><row row-number="2" height="27" band="title"/><row row-number="3" height="26" band="title"/><row row-number="4" height="26" band="title"/><row row-number="5" height="25" band="title"/><row row-number="6" height="23" band="title"/><row row-number="7" height="26"/><row row-number="8" height="25"/><row row-number="9" height="39" band="summary"/><row row-number="10" height="17" band="summary"/><row row-number="11" height="17" band="summary"/><row row-number="12" height="20" band="summary"/><row row-number="13" height="19" band="summary"/><row row-number="14" height="15" band="summary"/><row row-number="15" height="15" band="summary"/><row row-number="16" height="16" band="summary"/><row row-number="17" height="41" band="summary"/><row row-number="18" height="19" band="summary"/><row row-number="19" height="19" band="summary"/><column col-number="1" width="34"/><column col-number="2" width="47"/><column col-number="3" width="20"/><column col-number="4" width="67"/><column col-number="5" width="40"/><column col-number="6" width="64"/><column col-number="7" width="50"/><column col-number="8" width="26"/><column col-number="9" width="44"/><column col-number="10" width="43"/><column col-number="11" width="45"/><column col-number="12" width="25"/><column col-number="13" width="34"/><footer font-family="瀹嬩綋" font-size="10" forecolor="0,0,0" margin="23"><center><![CDATA["绗�"+page()+"椤�,鍏�"+pages()+"椤�"]]></center></footer><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="table2" type="sql"><sql><![CDATA[SELECT
+ *
+ FROM UTL_PHYSICAL_DETAIL WHERE FORM_ID = (:formId)]]></sql><field name="DETAIL_ID"/><field name="FORM_ID"/><field name="KEY_ID"/><field name="ARCHIVAL_CODE"/><field name="ITEM_NUMBER"/><field name="FILE_ID"/><field name="ITEM_ID"/><field name="FILE_TITLE"/><field name="ITEM_TITLE"/><field name="PROCESSING_TYPE"/><field name="SURVEY"/><field name="SAMPLING"/><field name="AGREE"/><field name="DRILLING_NAME"/><field name="SAMPLING_DEPTH"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="CREATE_TIME"/><field name="MODIFY_TIME"/><field name="CREATE_DEPT_ID"/><field name="CREATE_DEPT_NAME"/><field name="PROJECT_NAME"/><field name="PROJECT_NUM"/><field name="POSITION"/><field name="SAMPLE_NUM"/><field name="SAMPLE_TYPE"/><field name="VESSEL_VOYAGE"/><field name="SURVEYED_AREA"/><parameter name="formId" type="String" default-value="-1"/></dataset><dataset name="table3" type="sql"><sql><![CDATA[select * from UTL_PHYSICAL_FORM where FORM_ID =(:formId)]]></sql><field name="FORM_ID"/><field name="APPLY_CODE"/><field name="UTILIZATION_TYPE"/><field name="DEPT_NAME"/><field name="DEPT_ADDRESS"/><field name="APPLY_USER"/><field name="CARD_ID"/><field name="TEL_NUMBER"/><field name="EMAIL"/><field name="PROJECT_NAME"/><field name="TITLE"/><field name="ARCHIVAL_CODE"/><field name="OBSERVATION_SCOPE"/><field name="OBSERVATION_TIME"/><field name="SAMPLE_NUM"/><field name="SAMPLE_METHOD"/><field name="TEST_PROJECT"/><field name="SEND_INSTITUTION"/><field name="RESEARCH_PURPOSE"/><field name="RESEARCH_CONTENT"/><field name="EXPECTED_RESULT"/><field name="APPLY_DEPT_OPINION"/><field name="AGREE"/><field name="PHYSICAL_DATE"/><field name="REMARK"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="CREATE_TIME"/><field name="MODIFY_TIME"/><field name="CREATE_DEPT_ID"/><field name="CREATE_DEPT_NAME"/><field name="APPLY_USER_ID"/><field name="STATE"/><field name="FLOW_STEP"/><field name="PROCESS_INSTANCE_ID"/><field name="FLOW_STATE"/><field name="FULLTEXT_STATE"/><field name="DELETE_TIME"/><field name="DELETE_STATE"/><field name="SECURITY_CODE"/><field name="FILE_COUNT"/><field name="ITEM_COUNT"/><field name="JOB_TITLE"/><field name="DEPT_ID"/><parameter name="formId" type="String" default-value="-1"/></dataset></datasource><paper type="A4" left-margin="28" right-margin="28"
+ top-margin="57" bottom-margin="43" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="portrait" html-report-align="left" bg-image="http://192.168.100.66//static/images/planFormStatistics.jpg" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport 2.xml b/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport 2.xml
new file mode 100644
index 0000000..ff0bf7f
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport 2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍒╃敤浜烘]]></simple-value></cell><cell expand="None" name="B1" row="1" col="2" col-span="3"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[2]]></simple-value></cell><cell expand="None" name="E1" row="1" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浜烘]]></simple-value></cell><cell expand="None" name="A2" row="2" col="1"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍒╃敤浠芥]]></simple-value></cell><cell expand="None" name="B2" row="2" col="2" col-span="3"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[2]]></simple-value></cell><cell expand="None" name="E2" row="2" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浠芥]]></simple-value></cell><cell expand="None" name="A3" row="3" col="1"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍒╃敤浠舵]]></simple-value></cell><cell expand="None" name="B3" row="3" col="2" col-span="3"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[20]]></simple-value></cell><cell expand="None" name="E3" row="3" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浠舵]]></simple-value></cell><cell expand="None" name="A4" row="4" col="1" row-span="3"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绾歌川璧勬枡澶嶅埗閲廬]></simple-value></cell><cell expand="None" name="B4" row="4" col="2"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浠芥]]></simple-value></cell><cell expand="None" name="C4" row="4" col="3" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[0]]></simple-value></cell><cell expand="None" name="E4" row="4" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堜唤锛塢]></simple-value></cell><cell expand="None" name="B5" row="5" col="2"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎶ュ憡]]></simple-value></cell><cell expand="None" name="C5" row="5" col="3" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[0]]></simple-value></cell><cell expand="None" name="E5" row="5" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堥〉锛塢]></simple-value></cell><cell expand="None" name="B6" row="6" col="2"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍥句欢]]></simple-value></cell><cell expand="None" name="C6" row="6" col="3" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[0]]></simple-value></cell><cell expand="None" name="E6" row="6" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堝箙锛塢]></simple-value></cell><cell expand="None" name="A7" row="7" col="1" row-span="4"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢靛瓙鏁版嵁澶嶅埗閲廬]></simple-value></cell><cell expand="None" name="B7" row="7" col="2" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎬婚噺]]></simple-value></cell><cell expand="None" name="C7" row="7" col="3"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浠芥]]></simple-value></cell><cell expand="None" name="D7" row="7" col="4"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[0]]></simple-value></cell><cell expand="None" name="E7" row="7" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堜唤锛塢]></simple-value></cell><cell expand="None" name="C8" row="8" col="3"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏁版嵁閲廬]></simple-value></cell><cell expand="None" name="D8" row="8" col="4"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[0.000000]]></simple-value></cell><cell expand="None" name="E8" row="8" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛圙B锛塢]></simple-value></cell><cell expand="None" name="B9" row="9" col="2" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍥炬枃鏁板瓧鍖朷]></simple-value></cell><cell expand="None" name="C9" row="9" col="3"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浠芥]]></simple-value></cell><cell expand="None" name="D9" row="9" col="4"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[0]]></simple-value></cell><cell expand="None" name="E9" row="9" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堜唤锛塢]></simple-value></cell><cell expand="None" name="C10" row="10" col="3"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏁版嵁閲廬]></simple-value></cell><cell expand="None" name="D10" row="10" col="4"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[0.000000]]></simple-value></cell><cell expand="None" name="E10" row="10" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛圙B锛塢]></simple-value></cell><row row-number="1" height="26"/><row row-number="2" height="19"/><row row-number="3" height="19"/><row row-number="4" height="19"/><row row-number="5" height="19"/><row row-number="6" height="19"/><row row-number="7" height="19"/><row row-number="8" height="19"/><row row-number="9" height="19"/><row row-number="10" height="19"/><column col-number="1" width="105"/><column col-number="2" width="75"/><column col-number="3" width="53"/><column col-number="4" width="47"/><column col-number="5" width="64"/><footer font-family="瀹嬩綋" font-size="10" forecolor="0,0,0" margin="23"><center><![CDATA["绗�"+page()+"椤�,鍏�"+pages()+"椤�"]]></center></footer><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="table2" type="sql"><sql><![CDATA[SELECT
+ ARCHIVAL_CODE,
+ FILE_TITLE,
+ ITEM_TITLE锛�
+ SECURITY_CLASSIFICATION锛�
+ ITEM_NUMBER,
+ SECURITY_PAGE_NUM,
+ case when ELECTRONIC = '1' and AGREE = '1' then '鈭�'
+ else '' end as ELECTRONIC,
+ case when PAPER = '1' and AGREE = '1' then '鈭�'
+ else '' end as PAPER,
+ case when ORIGINAL = '1' and AGREE = '1' then '鈭�'
+ else '' end as ORIGINAL
+ FROM UTL_BORROW_DETAIL WHERE FORM_ID = (:formId)]]></sql><field name="ARCHIVAL_CODE"/><field name="FILE_TITLE"/><field name="ITEM_TITLE"/><field name="SECURITY_CLASSIFICATION"/><field name="ITEM_NUMBER"/><field name="SECURITY_PAGE_NUM"/><field name="ELECTRONIC"/><field name="PAPER"/><field name="ORIGINAL"/><parameter name="formId" type="String" default-value="-1"/></dataset><dataset name="table3" type="sql"><sql><![CDATA[select * from UTL_BORROW_FORM where FORM_ID =(:formId)]]></sql><field name="FORM_ID"/><field name="APPLY_CODE"/><field name="BORROW_TYPE"/><field name="BORROW_USER_ID"/><field name="BORROW_USER_NAME"/><field name="POST_CODE"/><field name="CERTIFICATE_NUMBER"/><field name="TEL_NUMBER"/><field name="BORROW_TEL"/><field name="BORROW_DATE"/><field name="BORROW_VALID_DATE"/><field name="BORROW_PURPOSE"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="CREATE_TIME"/><field name="MODIFY_TIME"/><field name="CREATE_DEPT_ID"/><field name="CREATE_DEPT_NAME"/><field name="REMARK"/><field name="STATE"/><field name="SECURITY_CLASSIFICATION"/><field name="DEPT_NAME"/><field name="DEPT_ADDRESS"/><field name="FULLTEXT_STATE"/><field name="FLOW_STATE"/><field name="PROCESS_INSTANCE_ID"/><field name="FLOW_STEP"/><field name="SECURITY_CODE"/><field name="DELETE_STATE"/><field name="DELETE_TIME"/><field name="FILE_COUNT"/><field name="ITEM_COUNT"/><parameter name="formId" type="String" default-value="-1"/></dataset></datasource><paper type="A4" left-margin="28" right-margin="28"
+ top-margin="57" bottom-margin="43" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="portrait" html-report-align="left" bg-image="http://192.168.100.66//static/images/planFormStatistics.jpg" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport.xml
new file mode 100644
index 0000000..d95d564
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" col-span="13"><cell-style font-size="14" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"></cell-style><simple-value><![CDATA[鍦拌川璧勬枡鍊熼槄鐢宠琛╙]></simple-value></cell><cell expand="None" name="A2" row="2" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜篯]></simple-value></cell><cell expand="None" name="D2" row="2" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_USER_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G2" row="2" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢佃瘽]]></simple-value></cell><cell expand="None" name="I2" row="2" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_TEL" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A3" row="3" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎵�鍦ㄩ儴闂╙]></simple-value></cell><cell expand="None" name="D3" row="3" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="DEPT_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A4" row="4" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠鏃ユ湡]]></simple-value></cell><cell expand="None" name="D4" row="4" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_DATE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G4" row="4" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[褰掕繕鏃堕棿]]></simple-value></cell><cell expand="None" name="I4" row="4" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鈻�1涓湀 鈻″氨鍦板�熼槄]]></simple-value></cell><cell expand="None" name="A5" row="5" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡鐢ㄩ�擼]></simple-value></cell><cell expand="None" name="D5" row="5" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_PURPOSE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A6" row="6" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡瀵嗙骇]]></simple-value></cell><cell expand="None" name="D6" row="6" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鈻$粷瀵嗙骇 鈻℃満瀵嗙骇 鈻$瀵嗙骇 鈻″伐浣滅瀵哴]></simple-value></cell><cell expand="None" name="A7" row="7" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[妗e彿]]></simple-value></cell><cell expand="None" name="D7" row="7" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏂囦欢棰樺悕]]></simple-value></cell><cell expand="None" name="G7" row="7" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢靛瓙]]></simple-value></cell><cell expand="None" name="H7" row="7" col="8"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绾歌川]]></simple-value></cell><cell expand="None" name="I7" row="7" col="9"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璋冮槄鍘熶欢]]></simple-value></cell><cell expand="None" name="J7" row="7" col="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[瀵嗙骇]]></simple-value></cell><cell expand="None" name="K7" row="7" col="11"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[娑夊瘑椤电爜]]></simple-value></cell><cell expand="None" name="L7" row="7" col="12" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[澶囨敞]]></simple-value></cell><cell expand="Down" name="A8" row="8" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ARCHIVAL_CODE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="D8" row="8" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ITEM_TITLE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="G8" row="8" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ELECTRONIC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="H8" row="8" col="8"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="PAPER" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="I8" row="8" col="9"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ORIGINAL" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="J8" row="8" col="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="SECURITY_CLASSIFICATION" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="K8" row="8" col="11"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="SECURITY_PAGE_NUM" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="L8" row="8" col="12" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A9" row="9" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜烘壙璇篯]></simple-value></cell><cell expand="None" name="D9" row="9" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 1.鏈汉鐢宠鐨勮祫鏂欎弗鏍兼寜鐓ф湰琛ㄤ腑濉啓鐨勭敤閫斾娇鐢紝涓嶅悜绗笁鏂规彁渚涳紝涓嶄互浠讳綍
+褰㈠紡鍦ㄤ簰鑱旂綉涓婁紶鎾��
+ 2.涓ユ牸鎸夌収灞�淇濆瘑瑙勫畾瑕佹眰淇濈銆佷娇鐢紙濡傦細澶嶅嵃鐨勶紝濉啓銆婃秹瀵嗚浇浣撳唴閮�/閫佸
+鍗板埗瀹℃壒琛ㄣ�嬶紙瑙佸眬銆婃秹瀵嗚浇浣撳嵃鍒朵繚瀵嗙鐞嗚瀹氥�嬶級灞ヨ瀹℃壒鎵嬬画锛涘鍏ユ秹瀵嗚绠�
+鏈�,濉啓銆婃秹瀵嗚绠楁満淇℃伅杈撳叆瀹℃壒琛ㄣ�嬶紙瑙佸眬銆婁俊鎭畨鍏ㄤ繚瀵嗘搷浣滆绋嬨�嬶級灞ヨ
+瀹℃壒鎵� 缁級銆�
+ 3.瀵瑰洜鏈汉鎵�鍊熼槄鐨勮祫鏂欓�犳垚鐨勫け娉勫瘑鎵挎媴鍏ㄩ儴璐d换锛屾帴鏀跺苟閰嶅悎淇濆瘑妫�鏌ャ��
+ 4.鏈汉瀵圭敵璇疯〃濉啓鐨勫唴瀹圭殑鐪熷疄鎬ц礋璐]></simple-value></cell><cell expand="None" name="A10" row="10" col="1" row-span="2" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜烘墍鍦�
+閮ㄩ棬璐熻矗浜篯]></simple-value></cell><cell expand="None" name="D10" row="10" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堝伐浣滅瀵嗐�佺瀵嗙骇銆佹満瀵嗙骇瀹℃牳锛岀粷瀵嗙骇瀹℃牳锛涘鍒剁Щ浜ゅ鍗曚綅瀹℃牳锛塢]></simple-value></cell><cell expand="None" name="D11" row="11" col="4" col-span="10"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A12" row="12" col="1" row-span="2" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[椤圭洰绠$悊/
+绉戝鎶�鏈
+璐熻矗浜篯]></simple-value></cell><cell expand="None" name="D12" row="12" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堢粷瀵嗙骇瀹℃牳锛塢]></simple-value></cell><cell expand="None" name="D13" row="13" col="4" col-span="10"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A14" row="14" col="1" row-span="2" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[灞�棰嗗]]></simple-value></cell><cell expand="None" name="D14" row="14" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堢粷瀵嗙骇瀹℃壒锛涘鍒剁Щ浜ゅ鍗曚綅瀹℃壒锛塢]></simple-value></cell><cell expand="None" name="D15" row="15" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><row row-number="1" height="26" band="title"/><row row-number="2" height="27" band="title"/><row row-number="3" height="26" band="title"/><row row-number="4" height="25" band="title"/><row row-number="5" height="29" band="title"/><row row-number="6" height="29" band="title"/><row row-number="7" height="26" band="title"/><row row-number="8" height="25"/><row row-number="9" height="152" band="summary"/><row row-number="10" height="33" band="summary"/><row row-number="11" height="33" band="summary"/><row row-number="12" height="22" band="summary"/><row row-number="13" height="42" band="summary"/><row row-number="14" height="23" band="summary"/><row row-number="15" height="50" band="summary"/><column col-number="1" width="34"/><column col-number="2" width="47"/><column col-number="3" width="15"/><column col-number="4" width="40"/><column col-number="5" width="64"/><column col-number="6" width="60"/><column col-number="7" width="50"/><column col-number="8" width="44"/><column col-number="9" width="44"/><column col-number="10" width="43"/><column col-number="11" width="45"/><column col-number="12" width="25"/><column col-number="13" width="28"/><footer font-family="瀹嬩綋" font-size="10" forecolor="0,0,0" margin="23"><center><![CDATA["绗�"+page()+"椤�,鍏�"+pages()+"椤�"]]></center></footer><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="table2" type="sql"><sql><![CDATA[SELECT
+ *,
+ case when ELECTRONIC = '1' and AGREE = '1' then '鈭�'
+ else '' end as ELECTRONIC,
+ case when PAPER = '1' and AGREE = '1' then '鈭�'
+ else '' end as PAPER,
+ case when ORIGINAL = '1' and AGREE = '1' then '鈭�'
+ else '' end as ORIGINAL
+ FROM UTL_BORROW_DETAIL WHERE FORM_ID = (:formId)]]></sql><field name="DETAIL_ID"/><field name="FORM_ID"/><field name="FILE_ID"/><field name="ITEM_ID"/><field name="ARCHIVAL_CODE"/><field name="ITEM_NUMBER"/><field name="FILE_TITLE"/><field name="ITEM_TITLE"/><field name="BORROW_TYPE"/><field name="AGREE"/><field name="SECURITY_CLASSIFICATION"/><field name="SECURITY_PAGE_NUM"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="MODIFY_TIME"/><field name="CREATE_TIME"/><field name="CREATE_DEPT_NAME"/><field name="CREATE_DEPT_ID"/><field name="ELECTRONIC"/><field name="PAPER"/><field name="ORIGINAL"/><field name="PAPER_BORROW"/><field name="ITEM_CODE"/><field name="ELECTRONIC"/><field name="PAPER"/><field name="ORIGINAL"/><parameter name="formId" type="String" default-value="-1"/></dataset><dataset name="table3" type="sql"><sql><![CDATA[SELECT
+ *
+ FROM UTL_BORROW_FORM WHERE FORM_ID = (:formId)]]></sql><field name="FORM_ID"/><field name="APPLY_CODE"/><field name="BORROW_TYPE"/><field name="BORROW_USER_ID"/><field name="BORROW_USER_NAME"/><field name="POST_CODE"/><field name="CERTIFICATE_NUMBER"/><field name="TEL_NUMBER"/><field name="BORROW_TEL"/><field name="BORROW_DATE"/><field name="BORROW_VALID_DATE"/><field name="BORROW_PURPOSE"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="CREATE_TIME"/><field name="MODIFY_TIME"/><field name="CREATE_DEPT_ID"/><field name="CREATE_DEPT_NAME"/><field name="REMARK"/><field name="STATE"/><field name="SECURITY_CLASSIFICATION"/><field name="DEPT_NAME"/><field name="DEPT_ADDRESS"/><field name="FULLTEXT_STATE"/><field name="FLOW_STATE"/><field name="PROCESS_INSTANCE_ID"/><field name="FLOW_STEP"/><field name="SECURITY_CODE"/><field name="DELETE_STATE"/><field name="DELETE_TIME"/><field name="FILE_COUNT"/><field name="ITEM_COUNT"/><field name="ID_CARD"/><field name="UTILIZATION_METHOD"/><field name="PAPER_BORROW"/><parameter name="formId" type="String" default-value="-1"/></dataset></datasource><paper type="A4" left-margin="28" right-margin="28"
+ top-margin="57" bottom-margin="43" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="portrait" html-report-align="left" bg-image="http://192.168.100.66//static/images/planFormStatistics.jpg" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/borrowing_approval_form.ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/borrowing_approval_form.ureport.xml
new file mode 100644
index 0000000..dbe2df3
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/borrowing_approval_form.ureport.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" col-span="4"><cell-style font-size="25" forecolor="0,0,0" align="center" valign="middle"></cell-style><simple-value><![CDATA[鍦板嫎鍏徃鍐呴儴璧勬枡鍊熼槄瀹℃壒琛╙]></simple-value></cell><cell expand="None" name="A2" row="2" col="1"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠鍗曚綅]]></simple-value></cell><cell expand="Down" name="B2" row="2" col="2"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" wrap-compute="false" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="鍊熼槄浜烘暟鎹�" aggregate="group" property="DEPT_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="C2" row="2" col="3"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜篯]></simple-value></cell><cell expand="Down" name="D2" row="2" col="4"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="鍊熼槄浜烘暟鎹�" aggregate="group" property="CREATE_USER_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A3" row="3" col="1"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍒嗗瓙鍏徃
+璐熻矗浜虹瀛梋]></simple-value></cell><cell expand="None" name="B3" row="3" col="2"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="C3" row="3" col="3"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍒嗙棰嗗绛惧瓧]]></simple-value></cell><cell expand="None" name="D3" row="3" col="4"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A4" row="4" col="1"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎶�鏈祫婧�
+鍚嶇О]]></simple-value></cell><cell expand="None" name="B4" row="4" col="2"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="C4" row="4" col="3"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡鐢ㄩ�擼]></simple-value></cell><cell expand="Down" name="D4" row="4" col="4"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="鍊熼槄浜烘暟鎹�" aggregate="group" property="PROCESSING_PURPOSE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A5" row="5" col="1" col-span="4"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡璇︾粏娓呭崟]]></simple-value></cell><cell expand="None" name="A6" row="6" col="1"><cell-style font-size="15" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[搴忓彿]]></simple-value></cell><cell expand="None" name="B6" row="6" col="2"><cell-style font-size="15" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐪侀妗e彿]]></simple-value></cell><cell expand="None" name="C6" row="6" col="3"><cell-style font-size="15" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[妗堝嵎棰樺悕]]></simple-value></cell><cell expand="None" name="D6" row="6" col="4"><cell-style font-size="15" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏂囦欢棰樺悕]]></simple-value></cell><cell expand="None" name="A7" row="7" col="1" left-cell="B7"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><expression-value><![CDATA[row() - 6]]></expression-value></cell><cell expand="Down" name="B7" row="7" col="2" left-cell="root"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="鍊熼槄璧勬枡鏄庣粏" aggregate="select" property="ARCHIVAL_CODE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="C7" row="7" col="3"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="鍊熼槄璧勬枡鏄庣粏" aggregate="select" property="FILE_TITLE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="D7" row="7" col="4"><cell-style font-size="13" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="鍊熼槄璧勬枡鏄庣粏" aggregate="select" property="ITEM_TITLE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A8" row="8" col="1" row-span="2"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢熶骇鎶�鏈儴
+閮ㄩ暱绛惧瓧]]></simple-value></cell><cell expand="None" name="B8" row="8" col="2" col-span="3"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="B9" row="9" col="2"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="C9" row="9" col="3" col-span="2"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏃ユ湡锛� 骞� 鏈� 鏃]></simple-value></cell><cell expand="None" name="A10" row="10" col="1" row-span="2"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎬诲伐绋嬪笀
+绛惧瓧]]></simple-value></cell><cell expand="None" name="B10" row="10" col="2" col-span="3"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="B11" row="11" col="2"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="C11" row="11" col="3" col-span="2"><cell-style font-size="15" forecolor="0,0,0" font-family="榛戜綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏃ユ湡锛� 骞� 鏈� 鏃]></simple-value></cell><row row-number="1" height="60" band="title"/><row row-number="2" height="60"/><row row-number="3" height="60"/><row row-number="4" height="60"/><row row-number="5" height="38"/><row row-number="6" height="60"/><row row-number="7" height="60"/><row row-number="8" height="90"/><row row-number="9" height="19"/><row row-number="10" height="90"/><row row-number="11" height="19"/><column col-number="1" width="113"/><column col-number="2" width="113"/><column col-number="3" width="113"/><column col-number="4" width="113"/><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="鍊熼槄浜烘暟鎹�" type="sql"><sql><![CDATA[select * from UTL_PROCESSING_FORM where form_id=:formId]]></sql><field name="FORM_ID"/><field name="APPLY_CODE"/><field name="PROCESSING_TYPE"/><field name="PROCESSING_USER_ID"/><field name="PROCESSING_USER_NAME"/><field name="POST_CODE"/><field name="CERTIFICATE_NUMBER"/><field name="TEL_NUMBER"/><field name="PROCESSING_TEL"/><field name="PROCESSING_DATE"/><field name="PROCESSING_VALID_DATE"/><field name="PROCESSING_PURPOSE"/><field name="REMARK"/><field name="STATE"/><field name="SECURITY_CLASSIFICATION"/><field name="DEPT_NAME"/><field name="DEPT_ADDRESS"/><field name="PROJECT_TYPE"/><field name="PROJECT_NAME"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="CREATE_TIME"/><field name="MODIFY_TIME"/><field name="CREATE_DEPT_ID"/><field name="CREATE_DEPT_NAME"/><field name="SECURITY_CODE"/><field name="DELETE_STATE"/><field name="DELETE_TIME"/><field name="FULLTEXT_STATE"/><field name="FLOW_STATE"/><field name="PROCESS_INSTANCE_ID"/><field name="FLOW_STEP"/><field name="FILE_COUNT"/><field name="ITEM_COUNT"/><field name="ID_CARD"/><field name="OTHER_APPLY"/><field name="SOURCE_FILE_COUNT"/><field name="ARCHIVE_FILE_COUNT"/><field name="ORIGINAL_FILE_COUNT"/><field name="OLD_ID"/><field name="PROCESS_REMARK"/><parameter name="formId" type="String" default-value="1937783420629078018"/></dataset><dataset name="鍊熼槄璧勬枡鏄庣粏" type="sql"><sql><![CDATA[select * from UTL_PROCESSING_DETAIL where FORM_ID=:formId]]></sql><field name="DETAIL_ID"/><field name="FORM_ID"/><field name="FILE_ID"/><field name="ITEM_ID"/><field name="ARCHIVAL_CODE"/><field name="ITEM_NUMBER"/><field name="FILE_TITLE"/><field name="ITEM_TITLE"/><field name="PROCESSING_TYPE"/><field name="DOWNLOAD"/><field name="PRINT"/><field name="AGREE"/><field name="SECURITY_CLASSIFICATION"/><field name="SECURITY_PAGE_NUM"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="CREATE_TIME"/><field name="CREATE_DEPT_ID"/><field name="CREATE_DEPT_NAME"/><field name="MODIFY_TIME"/><field name="SECURITY_CODE"/><field name="DEPT_NAME"/><field name="OLD_ID"/><field name="DELETE_SECURITY_PAGE"/><parameter name="formId" type="String" default-value="1930173614487826433"/></dataset></datasource><paper type="A4" left-margin="90" right-margin="90"
+ top-margin="72" bottom-margin="72" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="portrait" html-report-align="left" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_confluence_ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_confluence_ureport.xml
new file mode 100644
index 0000000..ee0a480
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_confluence_ureport.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡妗e彿]]></simple-value></cell><cell expand="None" name="B1" row="1" col="2" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绫诲埆]]></simple-value></cell><cell expand="None" name="C1" row="1" col="3" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡鍚嶇О]]></simple-value></cell><cell expand="None" name="D1" row="1" col="4" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[姹囦氦浜篯]></simple-value></cell><cell expand="None" name="E1" row="1" col="5" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[褰㈡垚鏃ユ湡]]></simple-value></cell><cell expand="None" name="F1" row="1" col="6" col-span="9"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[姣忎唤鎶ュ憡鍐呭]]></simple-value></cell><cell expand="None" name="O1" row="1" col="15" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[瀵嗙骇鎴栦繚鎶�
+鏈熼檺]]></simple-value></cell><cell expand="None" name="P1" row="1" col="16" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎴愭灉娑夊瘑浠舵暟]]></simple-value></cell><cell expand="None" name="Q1" row="1" col="17" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎴愭灉鐢靛瓙瀹归噺]]></simple-value></cell><cell expand="None" name="R1" row="1" col="18" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[婀樺湴璧勬眹缂栧彿]]></simple-value></cell><cell expand="None" name="S1" row="1" col="19" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[姹囦氦鏃ユ湡]]></simple-value></cell><cell expand="None" name="T1" row="1" col="20" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹浜篯]></simple-value></cell><cell expand="None" name="U1" row="1" col="21" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍒嗙被]]></simple-value></cell><cell expand="None" name="V1" row="1" col="22" col-span="4"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍘熷璧勬枡姹囦氦鎯呭喌]]></simple-value></cell><cell expand="None" name="F2" row="2" col="6"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[姝f枃(鍐�)]]></simple-value></cell><cell expand="None" name="G2" row="2" col="7"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[闄勫浘锛堝紶锛塢]></simple-value></cell><cell expand="None" name="H2" row="2" col="8"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍥惧唽]]></simple-value></cell><cell expand="None" name="I2" row="2" col="9"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[闄勮〃锛堝唽锛塢]></simple-value></cell><cell expand="None" name="J2" row="2" col="10"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[闄勪欢锛堝唽锛塢]></simple-value></cell><cell expand="None" name="K2" row="2" col="11"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍏朵粬锛堝唽锛塢]></simple-value></cell><cell expand="None" name="L2" row="2" col="12"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏁版嵁搴撳強杞欢]]></simple-value></cell><cell expand="None" name="M2" row="2" col="13"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[瀹℃壒绫�(鍐�)]]></simple-value></cell><cell expand="None" name="N2" row="2" col="14"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍏夌洏锛堝紶锛塢]></simple-value></cell><cell expand="None" name="V2" row="2" col="22"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏂囦欢
+浠舵暟]]></simple-value></cell><cell expand="None" name="W2" row="2" col="23"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[瀹归噺]]></simple-value></cell><cell expand="None" name="X2" row="2" col="24"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[瀵嗙骇]]></simple-value></cell><cell expand="None" name="Y2" row="2" col="25"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[娑夊瘑
+浠舵暟]]></simple-value></cell><cell expand="Down" name="A3" row="3" col="1" left-cell="C3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="DH" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="B3" row="3" col="2" left-cell="C3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="Down" name="C3" row="3" col="3" left-cell="root" top-cell="root"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="ZLMC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="D3" row="3" col="4"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="HJRMC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="E3" row="3" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="XCSJ" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="F3" row="3" col="6"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="ZWDZJS" order="none" mapping-type="simple"></dataset-value><condition-property-item name="ss"><cell-style for-condition="true" font-size-scope="cell" forecolor-scope="cell" font-family-scope="cell" bgcolor-scope="cell" bold-scope="cell" italic-scope="cell" underline-scope="cell" align-scope="cell" valign-scope="cell"></cell-style></condition-property-item></cell><cell expand="Down" name="G3" row="3" col="7"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="FTDZJS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="H3" row="3" col="8"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="TDZJS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="I3" row="3" col="9"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="FBDZJS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="J3" row="3" col="10"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="FJDZJS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="K3" row="3" col="11"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="QTDZJS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="L3" row="3" col="12"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="SJKDZJS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="M3" row="3" col="13"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="SPDZJS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="N3" row="3" col="14"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="DMTDZJS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="O3" row="3" col="15"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="MJ" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="P3" row="3" col="16"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="Q3" row="3" col="17"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="R3" row="3" col="18"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="Down" name="S3" row="3" col="19" left-cell="C3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="JSRQ" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="T3" row="3" col="20" left-cell="C3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="YSR" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="U3" row="3" col="21" left-cell="C3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="V3" row="3" col="22" left-cell="C3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="W3" row="3" col="23" left-cell="C3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="X3" row="3" col="24" left-cell="C3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="Y3" row="3" col="25" left-cell="C3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><row row-number="1" height="18" band="title"/><row row-number="2" height="19" band="title"/><row row-number="3" height="18"/><column col-number="1" width="35"/><column col-number="2" width="41"/><column col-number="3" width="101"/><column col-number="4" width="52"/><column col-number="5" width="53"/><column col-number="6" width="52"/><column col-number="7" width="52"/><column col-number="8" width="52"/><column col-number="9" width="52"/><column col-number="10" width="52"/><column col-number="11" width="52"/><column col-number="12" width="52"/><column col-number="13" width="52"/><column col-number="14" width="52"/><column col-number="15" width="62"/><column col-number="16" width="69"/><column col-number="17" width="64"/><column col-number="18" width="70"/><column col-number="19" width="49"/><column col-number="20" width="34"/><column col-number="21" width="36"/><column col-number="22" width="41"/><column col-number="23" width="41"/><column col-number="24" width="41"/><column col-number="25" width="41"/><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="ajjxx" type="sql"><sql><![CDATA[select * from cat_file_ajjxx]]></sql><field name="ID"/><field name="ZLLY"/><field name="HJRDH"/><field name="SGDH"/><field name="DH"/><field name="BZSDH"/><field name="HJZSDW"/><field name="BSSJ"/><field name="ZSDWAJH"/><field name="JSRQ"/><field name="JSDWMC"/><field name="BGDWMC"/><field name="ZLMC"/><field name="FZMC"/><field name="BZZ"/><field name="ZLLB"/><field name="ZLLBDM"/><field name="YZ"/><field name="GZCD"/><field name="QTGZCD"/><field name="GZFF"/><field name="SPSJ"/><field name="SMQK"/><field name="MJ"/><field name="SFBH"/><field name="BHQ"/><field name="BHSX"/><field name="HJPZH"/><field name="FZRQ"/><field name="FBRQ"/><field name="GJZ"/><field name="NRZY"/><field name="BGQX"/><field name="BZ"/><field name="HJRMC"/><field name="HJRDZ"/><field name="HJRTYSHXYDM"/><field name="HJRYB"/><field name="HJRLXR"/><field name="HJRLXFS"/><field name="HJRDZYX"/><field name="QSJD_FX"/><field name="QSJD_DU"/><field name="QSJD_FEN"/><field name="QSJD_MIAO"/><field name="ZZJD_FX"/><field name="ZZJD_DU"/><field name="ZZJD_FEN"/><field name="ZZJD_MIAO"/><field name="QSWD_FX"/><field name="QSWD_DU"/><field name="QSWD_FEN"/><field name="QSWD_MIAO"/><field name="ZZWD_FX"/><field name="ZZWD_DU"/><field name="ZZWD_FEN"/><field name="ZZWD_MIAO"/><field name="GDZB"/><field name="DLZBX"/><field name="XZQMC"/><field name="XZQDM"/><field name="KCDM"/><field name="KCMC"/><field name="DDGZWZ"/><field name="CKD"/><field name="ZYKZ"/><field name="CKSD"/><field name="CYLX"/><field name="ZYCGJS"/><field name="YDZWJGSJBB"/><field name="YJHJ"/><field name="RJHJ"/><field name="TJXTKZKTYSM"/><field name="QTSM"/><field name="ZWZZJS"/><field name="SPZZJS"/><field name="FTZZJS"/><field name="FBZZJS"/><field name="FJZZJS"/><field name="QTZJS"/><field name="HDS"/><field name="ZWDZJS"/><field name="SPDZJS"/><field name="FTDZJS"/><field name="FBDZJS"/><field name="FJDZJS"/><field name="RJDZJS"/><field name="SJKDZJS"/><field name="DMTDZJS"/><field name="QTDZJS"/><field name="CGZLSJL"/><field name="CGZLDZWJZS"/><field name="CGZLDZJS"/><field name="CGZLZZJS"/><field name="CGZLDZWJJZS"/><field name="DZZJS"/><field name="CZZJS"/><field name="GZZJS"/><field name="TZZJS"/><field name="YZZJS"/><field name="SZZJS"/><field name="LZZJS"/><field name="XZZJS"/><field name="ZZZJS"/><field name="WZZJS"/><field name="DDZJS"/><field name="CDZJS"/><field name="GDZJS"/><field name="TDZJS"/><field name="YDZJS"/><field name="SDZJS"/><field name="LDZJS"/><field name="XDZJS"/><field name="ZDZJS"/><field name="WDZJS"/><field name="YSDZSJL"/><field name="SWDH"/><field name="SWZLLB"/><field name="SWZLBCDW"/><field name="ZKSL"/><field name="ZJC"/><field name="YXZSL"/><field name="YXIZSL"/><field name="BBZSL"/><field name="YPZSL"/><field name="GPZSL"/><field name="BPZSL"/><field name="QTSWMC"/><field name="SWBZ"/><field name="QTSWSL"/><field name="XMKYQXZ"/><field name="XMKYQLX"/><field name="XMKYQMC"/><field name="XMKYQBH"/><field name="QSSJ"/><field name="ZZSJ"/><field name="XMZGJGMC"/><field name="XMCDDWKYQR"/><field name="XMFZR"/><field name="ZJLY"/><field name="XMXXSM"/><field name="XCDWMC"/><field name="XZDWDZ"/><field name="XZDWYB"/><field name="XZDWXYDM"/><field name="XZDWYX"/><field name="XZDWLXR"/><field name="XZDWLXRDH"/><field name="YSJZSJ"/><field name="SLR"/><field name="SLSJ"/><field name="CJSJ"/><field name="ZLZT"/><field name="ZLUZT"/><field name="FBZT"/><field name="YSR"/><field name="YSWSJ"/><field name="PZXXLRZT"/><field name="FBFSJ"/><field name="FBR"/><field name="ZWYDZJS"/><field name="SPYDZJS"/><field name="FTYDZJS"/><field name="FBYDZJS"/><field name="FJYDZJS"/><field name="RJYDZJS"/><field name="SJKYDZJS"/><field name="DMTYDZJS"/><field name="QTYDZJS"/><field name="ZWCDDZJS"/><field name="SPCDDZJS"/><field name="FTCDDZJS"/><field name="FBCDDZJS"/><field name="FJCDDZJS"/><field name="RJCDDZJS"/><field name="SJKCDDZJS"/><field name="DMTCDDZJS"/><field name="QTCDDZJS"/><field name="QTZZJS"/><field name="YSZLDZJS"/><field name="YSZLSJL"/><field name="YSZLDZWJZS"/><field name="YSZLDZWJJZS"/><field name="YSZLZZJS"/><field name="create_dept_name"/><field name="create_dept_id"/><field name="modify_time"/><field name="create_time"/><field name="create_user_name"/><field name="create_user_id"/><field name="delete_state"/><field name="fulltext_state"/><field name="XCSJ"/><field name="SPJG"/><field name="XCDWSHXYDM"/><field name="DLWZS"/></dataset></datasource><paper type="A4" left-margin="90" right-margin="90"
+ top-margin="72" bottom-margin="72" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="landscape" html-report-align="left" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_formingUnitStatistics.ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_formingUnitStatistics.ureport.xml
new file mode 100644
index 0000000..76b9267
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_formingUnitStatistics.ureport.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[褰㈡垚鍗曚綅]]></simple-value></cell><cell expand="None" name="B1" row="1" col="2" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[妗堝嵎鏁伴噺]]></simple-value></cell><cell expand="None" name="C1" row="1" col="3" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎴愭灉鏁伴噺]]></simple-value></cell><cell expand="None" name="D1" row="1" col="4" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍘熷鏁伴噺]]></simple-value></cell><cell expand="Down" name="A3" row="3" col="1" left-cell="B3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="HJRMC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="B3" row="3" col="2" left-cell="root" top-cell="root"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="ajnum" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="C3" row="3" col="3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="jnnum" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="D3" row="3" col="4"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="ysnum" order="none" mapping-type="simple"></dataset-value></cell><row row-number="1" height="18" band="title"/><row row-number="2" height="19" band="title"/><row row-number="3" height="18"/><column col-number="1" width="68"/><column col-number="2" width="122"/><column col-number="3" width="80"/><column col-number="4" width="80"/><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="ajjxx" type="sql"><sql><![CDATA[${
+ "select HJRMC,sum(ajnum) ajnum,sum(jnnum) jnnum,sum(ysnum) ysnum from( select HJRMC,count(HJRMC) ajnum,0 jnnum,0 ysnum from cat_file_ajjxx where 1=1 "
+ +(param("startDate")!=null && param("startDate")!="" ? " and JSRQ > \'"+param("startDate")+"\'":" ")
+ +(param("endDate")!=null && param("endDate")!="" ? " and JSRQ < \'"+param("endDate")+"\'":" ")
+ +(param("deptName")!=null && param("deptName")!="" ? " and XCDWMC = \'"+param("deptName")+"\'":" ")
+ +" group by HJRMC union all select a.HJRMC,0 ajnum,count(b.id) jnnum,0 ysnum from cat_file_ajjxx a,cat_item_yswjxx b where a.ID = b.AJ_ID"
+ +(param("startDate")!=null && param("startDate")!="" ? " and a.JSRQ > \'"+param("startDate")+"\'":" ")
+ +(param("endDate")!=null && param("endDate")!="" ? " and a.JSRQ < \'"+param("endDate")+"\'":" ")
+ +(param("deptName")!=null && param("deptName")!="" ? " and a.XCDWMC = \'"+param("deptName")+"\'":" ")
+ +" group by a.HJRMC union all select a.HJRMC,0 ajnum, 0 jnnum,count(b.id) ysnum from cat_file_ajjxx a,cat_item_yswjxx b where a.ID = b.AJ_ID "
+ +(param("startDate")!=null && param("startDate")!="" ? " and a.JSRQ > \'"+param("startDate")+"\'":" ")
+ +(param("endDate")!=null && param("endDate")!="" ? " and a.JSRQ < \'"+param("endDate")+"\'":" ")
+ +(param("deptName")!=null && param("deptName")!="" ? " and a.XCDWMC = \'"+param("deptName")+"\'":" ")
+ +" group by a.HJRMC) t group by HJRMC"
+}]]></sql><field name="HJRMC"/><field name="ajnum"/><field name="jnnum"/><field name="ysnum"/><parameter name="deptName" type="String" default-value=""/><parameter name="startDate" type="String" default-value=""/><parameter name="endDate" type="String" default-value=""/></dataset></datasource><paper type="A4" left-margin="90" right-margin="90"
+ top-margin="72" bottom-margin="72" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="landscape" html-report-align="left" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_hjqktj.ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_hjqktj.ureport.xml
new file mode 100644
index 0000000..bbe6935
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_hjqktj.ureport.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绫诲瀷]]></simple-value></cell><cell expand="None" name="B1" row="1" col="2" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏁伴噺]]></simple-value></cell><cell expand="Down" name="A3" row="3" col="1" left-cell="B3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="name" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="B3" row="3" col="2" left-cell="root" top-cell="root"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="num" order="none" mapping-type="simple"></dataset-value></cell><row row-number="1" height="18" band="title"/><row row-number="2" height="19" band="title"/><row row-number="3" height="18"/><column col-number="1" width="218"/><column col-number="2" width="63"/><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="ajjxx" type="sql"><sql><![CDATA[SELECT '鍖哄煙璋冩煡' as name , COUNT(*) as num from cat_file_ajjxx where ZLLB like '鍖哄煙%' or ZLLB = '鍩庡競鍦拌川璋冩煡' or ZLLB='鍏朵粬鍖哄煙鍦拌川璋冩煡'
+union all
+SELECT '娴锋磱鍦拌川璋冩煡' as name , COUNT(*) as num from cat_file_ajjxx where ZLLB like '%娴�%' or ZLLB = '澶ч檰鏋跺湴璐ㄧ熆浜ц皟鏌�' or ZLLB='鏋佸湴鍦拌川璋冩煡'
+union all
+SELECT '鐭夸骇鍕樻煡' as name , COUNT(*) as num from cat_file_ajjxx where ZLLB like '%鐭夸骇鍕樻煡%'
+union all
+SELECT '姘村伐鐜湴璐ㄥ嫎鏌�' as name, COUNT(*) as num from cat_file_ajjxx where ZLLB like '%鍦拌川鍕樻煡%' or ZLLB='澶╃劧鍦伴渿鍦拌川璋冩煡' or ZLLB='鐢熸�佸湴鐞冨寲瀛﹁皟鏌�'
+union all
+SELECT '鐗╁寲閬ュ嫎鏌�' as name, COUNT(*) as num from cat_file_ajjxx where ZLLB='鍦扮悆鐗╃悊鍕樻煡' or ZLLB='鍦扮悆鍖栧鍕樻煡' or ZLLB='閬ユ劅鍦拌川璋冩煡' or ZLLB='鐗╁寲鎺㈠紓甯告煡璇�' or ZLLB ='鐗╁寲閬ュ嫎鏌�'
+union all
+SELECT '鍦拌川绉戝鐮旂┒' as name, COUNT(*) as num from cat_file_ajjxx where ZLLB='鍦拌川绉戝鐮旂┒' or ZLLB='鐞嗚鐮旂┒' or ZLLB='搴旂敤鐮旂┒' or ZLLB='杞瀛︾爺绌�' or ZLLB ='缁煎悎鐮旂┒' or ZLLB ='鍦拌川閬楄抗璋冩煡' or ZLLB ='鍦拌川鍏洯瑙勫垝'
+union all
+SELECT '鎶�鏈柟娉曠爺绌�' as name, COUNT(*)as num from cat_file_ajjxx where ZLLB='鏍囧噯瑙勮寖鍒跺畾' or ZLLB='浠櫒璁惧鐮斿彂' or ZLLB='淇℃伅绯荤粺寤鸿' or ZLLB='鏁版嵁搴撳缓璁�' or ZLLB ='鍏朵粬鏂规硶'
+union all
+SELECT '鑷劧璧勬簮缁煎悎璋冩煡' as name, COUNT(*) as num from cat_file_ajjxx where ZLLB='鑷劧璧勬簮缁煎悎璋冩煡'
+union all
+SELECT '鍏朵粬' as name, COUNT(*)as num from cat_file_ajjxx where ZLLB='鍏朵粬' or ZLLB='鍌ㄩ噺琛�' or ZLLB='鍏朵粬鍦拌川宸ヤ綔' ]]></sql><field name="name"/><field name="num"/></dataset></datasource><paper type="A4" left-margin="90" right-margin="90"
+ top-margin="72" bottom-margin="72" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="landscape" html-report-align="left" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_ledger_ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_ledger_ureport.xml
new file mode 100644
index 0000000..f59a3ec
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/catAjjxx_ledger_ureport.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[搴忓彿]]></simple-value></cell><cell expand="None" name="B1" row="1" col="2" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎶ュ憡鍚嶇О]]></simple-value></cell><cell expand="None" name="C1" row="1" col="3" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎶ュ憡缂栧埗鍗曚綅]]></simple-value></cell><cell expand="None" name="D1" row="1" col="4" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鑱旂郴濮撳悕]]></simple-value></cell><cell expand="None" name="E1" row="1" col="5" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鑱旂郴鐢佃瘽]]></simple-value></cell><cell expand="None" name="F1" row="1" col="6" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗竴娆★紙鏂版帴鏀讹級]]></simple-value></cell><cell expand="None" name="H1" row="1" col="8" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗簩娆]></simple-value></cell><cell expand="None" name="J1" row="1" col="10" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗笁娆]></simple-value></cell><cell expand="None" name="L1" row="1" col="12" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗洓娆]></simple-value></cell><cell expand="None" name="N1" row="1" col="14" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗簲娆]></simple-value></cell><cell expand="None" name="P1" row="1" col="16" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[棣嗗唴楠屾敹浜篯]></simple-value></cell><cell expand="None" name="Q1" row="1" col="17" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎬讳慨鏀规鏁癩]></simple-value></cell><cell expand="None" name="R1" row="1" col="18" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎬讳綋楠屾敹鎯呭喌]]></simple-value></cell><cell expand="None" name="F2" row="2" col="6"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="G2" row="2" col="7"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="None" name="H2" row="2" col="8"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="I2" row="2" col="9"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="None" name="J2" row="2" col="10"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="K2" row="2" col="11"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="None" name="L2" row="2" col="12"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="M2" row="2" col="13"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="None" name="N2" row="2" col="14"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="O2" row="2" col="15"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="Down" name="A3" row="3" col="1" left-cell="B3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><expression-value><![CDATA[return row() - 2]]></expression-value></cell><cell expand="Down" name="B3" row="3" col="2" left-cell="root" top-cell="root"><cell-style font-size="10" font-family="寰蒋闆呴粦" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="ZLMC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="C3" row="3" col="3"><cell-style font-size="10" font-family="寰蒋闆呴粦" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="XCDWMC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="D3" row="3" col="4"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="HJRMC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="E3" row="3" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="HJRLXFS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="F3" row="3" col="6" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="ACCEPT_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="4f4c8ba0-86d4-11ef-84e4-01216287ef96" type="property" join="and"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="4f4cb2b0-86d4-11ef-84e4-01216287ef96" type="property" join="and"><value><![CDATA[1]]></value></condition></dataset-value><condition-property-item name="ss"><cell-style for-condition="true" font-size-scope="cell" forecolor-scope="cell" font-family-scope="cell" bgcolor-scope="cell" bold-scope="cell" italic-scope="cell" underline-scope="cell" align-scope="cell" valign-scope="cell"></cell-style></condition-property-item></cell><cell expand="None" name="G3" row="3" col="7" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="CHECK_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="7e44ce20-86d1-11ef-84e4-01216287ef96" type="property" join="and"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="7e44ce21-86d1-11ef-84e4-01216287ef96" type="property" join="and"><value><![CDATA[1]]></value></condition></dataset-value></cell><cell expand="None" name="H3" row="3" col="8" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="ACCEPT_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="5a8614a0-86d4-11ef-84e4-01216287ef96" type="property" join="and"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="5a8614a1-86d4-11ef-84e4-01216287ef96" type="property" join="and"><value><![CDATA[2]]></value></condition></dataset-value></cell><cell expand="None" name="I3" row="3" col="9" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="CHECK_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="79d6ecb0-86d1-11ef-84e4-01216287ef96" type="property" join="and"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="79d6ecb1-86d1-11ef-84e4-01216287ef96" type="property" join="and"><value><![CDATA[2]]></value></condition></dataset-value></cell><cell expand="None" name="J3" row="3" col="10" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="ACCEPT_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="ebc7bfe0-86d4-11ef-84e4-01216287ef96" type="undefined"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="f1779730-86d4-11ef-84e4-01216287ef96" type="undefined" join="and"><value><![CDATA[3]]></value></condition></dataset-value></cell><cell expand="None" name="K3" row="3" col="11" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="CHECK_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="0c5b49c0-86d5-11ef-84e4-01216287ef96" type="undefined"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="10ae0210-86d5-11ef-84e4-01216287ef96" type="undefined" join="and"><value><![CDATA[3]]></value></condition></dataset-value></cell><cell expand="None" name="L3" row="3" col="12" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="ACCEPT_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="15a0f200-86d5-11ef-84e4-01216287ef96" type="undefined"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="1a32af20-86d5-11ef-84e4-01216287ef96" type="undefined" join="and"><value><![CDATA[4]]></value></condition></dataset-value></cell><cell expand="None" name="M3" row="3" col="13" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="CHECK_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="205aeac0-86d5-11ef-84e4-01216287ef96" type="undefined"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="25093090-86d5-11ef-84e4-01216287ef96" type="undefined" join="and"><value><![CDATA[4]]></value></condition></dataset-value></cell><cell expand="None" name="N3" row="3" col="14" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="ACCEPT_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="2a6da700-86d5-11ef-84e4-01216287ef96" type="undefined"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="2f797620-86d5-11ef-84e4-01216287ef96" type="undefined" join="and"><value><![CDATA[5]]></value></condition></dataset-value></cell><cell expand="None" name="O3" row="3" col="15" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="CHECK_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="358920b0-86d5-11ef-84e4-01216287ef96" type="undefined"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="3ab68190-86d5-11ef-84e4-01216287ef96" type="undefined" join="and"><value><![CDATA[5]]></value></condition></dataset-value></cell><cell expand="Down" name="P3" row="3" col="16" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="YSR" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="Q3" row="3" col="17"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="#" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="max" property="TIME" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="c14ce8d0-86cf-11ef-84e4-01216287ef96" type="property"><value><![CDATA[ajjxx.select(id)]]></value></condition></dataset-value></cell><cell expand="None" name="R3" row="3" col="18"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><row row-number="1" height="18" band="headerrepeat"/><row row-number="2" height="19" band="headerrepeat"/><row row-number="3" height="18"/><column col-number="1" width="35"/><column col-number="2" width="122"/><column col-number="3" width="80"/><column col-number="4" width="80"/><column col-number="5" width="74"/><column col-number="6" width="70"/><column col-number="7" width="63"/><column col-number="8" width="58"/><column col-number="9" width="60"/><column col-number="10" width="65"/><column col-number="11" width="66"/><column col-number="12" width="74"/><column col-number="13" width="74"/><column col-number="14" width="74"/><column col-number="15" width="74"/><column col-number="16" width="74"/><column col-number="17" width="74"/><column col-number="18" width="74"/><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="ajjxx" type="sql"><sql><![CDATA[${
+ "select * from cat_file_ajjxx where 1=1"+
+ (param("title")!=null && param("title")!="" ? " and ZLMC = \'"+param("title")+"\'":" ")
+ +(param("deptName")!=null && param("deptName")!="" ? " and XCDWMC = \'"+param("deptName")+"\'":" ")
+}
+
+
+]]></sql><field name="ID"/><field name="ZLLY"/><field name="HJRDH"/><field name="SGDH"/><field name="DH"/><field name="BZSDH"/><field name="HJZSDW"/><field name="BSSJ"/><field name="ZSDWAJH"/><field name="JSRQ"/><field name="JSDWMC"/><field name="BGDWMC"/><field name="ZLMC"/><field name="FZMC"/><field name="BZZ"/><field name="ZLLB"/><field name="ZLLBDM"/><field name="YZ"/><field name="GZCD"/><field name="QTGZCD"/><field name="GZFF"/><field name="SPSJ"/><field name="SMQK"/><field name="MJ"/><field name="SFBH"/><field name="BHQ"/><field name="BHSX"/><field name="HJPZH"/><field name="FZRQ"/><field name="FBRQ"/><field name="GJZ"/><field name="NRZY"/><field name="BGQX"/><field name="BZ"/><field name="HJRMC"/><field name="HJRDZ"/><field name="HJRTYSHXYDM"/><field name="HJRYB"/><field name="HJRLXR"/><field name="HJRLXFS"/><field name="HJRDZYX"/><field name="QSJD_FX"/><field name="QSJD_DU"/><field name="QSJD_FEN"/><field name="QSJD_MIAO"/><field name="ZZJD_FX"/><field name="ZZJD_DU"/><field name="ZZJD_FEN"/><field name="ZZJD_MIAO"/><field name="QSWD_FX"/><field name="QSWD_DU"/><field name="QSWD_FEN"/><field name="QSWD_MIAO"/><field name="ZZWD_FX"/><field name="ZZWD_DU"/><field name="ZZWD_FEN"/><field name="ZZWD_MIAO"/><field name="GDZB"/><field name="DLZBX"/><field name="XZQMC"/><field name="XZQDM"/><field name="KCDM"/><field name="KCMC"/><field name="DDGZWZ"/><field name="CKD"/><field name="ZYKZ"/><field name="CKSD"/><field name="CYLX"/><field name="ZYCGJS"/><field name="YDZWJGSJBB"/><field name="YJHJ"/><field name="RJHJ"/><field name="TJXTKZKTYSM"/><field name="QTSM"/><field name="ZWZZJS"/><field name="SPZZJS"/><field name="FTZZJS"/><field name="FBZZJS"/><field name="FJZZJS"/><field name="QTZJS"/><field name="HDS"/><field name="ZWDZJS"/><field name="SPDZJS"/><field name="FTDZJS"/><field name="FBDZJS"/><field name="FJDZJS"/><field name="RJDZJS"/><field name="SJKDZJS"/><field name="DMTDZJS"/><field name="QTDZJS"/><field name="CGZLSJL"/><field name="CGZLDZWJZS"/><field name="CGZLDZJS"/><field name="CGZLZZJS"/><field name="CGZLDZWJJZS"/><field name="DZZJS"/><field name="CZZJS"/><field name="GZZJS"/><field name="TZZJS"/><field name="YZZJS"/><field name="SZZJS"/><field name="LZZJS"/><field name="XZZJS"/><field name="ZZZJS"/><field name="WZZJS"/><field name="DDZJS"/><field name="CDZJS"/><field name="GDZJS"/><field name="TDZJS"/><field name="YDZJS"/><field name="SDZJS"/><field name="LDZJS"/><field name="XDZJS"/><field name="ZDZJS"/><field name="WDZJS"/><field name="YSDZSJL"/><field name="SWDH"/><field name="SWZLLB"/><field name="SWZLBCDW"/><field name="ZKSL"/><field name="ZJC"/><field name="YXZSL"/><field name="YXIZSL"/><field name="BBZSL"/><field name="YPZSL"/><field name="GPZSL"/><field name="BPZSL"/><field name="QTSWMC"/><field name="SWBZ"/><field name="QTSWSL"/><field name="XMKYQXZ"/><field name="XMKYQLX"/><field name="XMKYQMC"/><field name="XMKYQBH"/><field name="QSSJ"/><field name="ZZSJ"/><field name="XMZGJGMC"/><field name="XMCDDWKYQR"/><field name="XMFZR"/><field name="ZJLY"/><field name="XMXXSM"/><field name="XCDWMC"/><field name="XZDWDZ"/><field name="XZDWYB"/><field name="XZDWXYDM"/><field name="XZDWYX"/><field name="XZDWLXR"/><field name="XZDWLXRDH"/><field name="YSJZSJ"/><field name="SLR"/><field name="SLSJ"/><field name="CJSJ"/><field name="ZLZT"/><field name="ZLUZT"/><field name="FBZT"/><field name="YSR"/><field name="YSWSJ"/><field name="PZXXLRZT"/><field name="FBFSJ"/><field name="FBR"/><field name="ZWYDZJS"/><field name="SPYDZJS"/><field name="FTYDZJS"/><field name="FBYDZJS"/><field name="FJYDZJS"/><field name="RJYDZJS"/><field name="SJKYDZJS"/><field name="DMTYDZJS"/><field name="QTYDZJS"/><field name="ZWCDDZJS"/><field name="SPCDDZJS"/><field name="FTCDDZJS"/><field name="FBCDDZJS"/><field name="FJCDDZJS"/><field name="RJCDDZJS"/><field name="SJKCDDZJS"/><field name="DMTCDDZJS"/><field name="QTCDDZJS"/><field name="QTZZJS"/><field name="YSZLDZJS"/><field name="YSZLSJL"/><field name="YSZLDZWJZS"/><field name="YSZLDZWJJZS"/><field name="YSZLZZJS"/><field name="CREATE_DEPT_NAME"/><field name="CREATE_DEPT_ID"/><field name="MODIFY_TIME"/><field name="CREATE_TIME"/><field name="CREATE_USER_NAME"/><field name="CREATE_USER_ID"/><field name="DELETE_STATE"/><field name="FULLTEXT_STATE"/><field name="XCSJ"/><field name="SPJG"/><field name="XCDWSHXYDM"/><field name="DLWZS"/><field name="RELATION_SW"/><field name="SW_ID"/><field name="COORDINATE"/><field name="OLD_ID"/><parameter name="deptName" type="String" default-value=""/><parameter name="title" type="String" default-value=""/></dataset><dataset name="time" type="sql"><sql><![CDATA[select * from cat_check]]></sql><field name="ID"/><field name="AJ_ID"/><field name="ACCEPT_DATE"/><field name="CHECK_DATE"/><field name="TIME"/><field name="create_user_id"/><field name="create_user_name"/><field name="create_time"/><field name="modify_time"/><field name="create_dept_id"/><field name="create_dept_name"/></dataset></datasource><paper type="A4" left-margin="90" right-margin="90"
+ top-margin="72" bottom-margin="72" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="landscape" html-report-align="left" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/catCgxx_original_ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/catCgxx_original_ureport.xml
new file mode 100644
index 0000000..91d9430
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/catCgxx_original_ureport.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡绫诲埆]]></simple-value></cell><cell expand="None" name="B1" row="1" col="2" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡绫诲埆]]></simple-value></cell><cell expand="None" name="C1" row="1" col="3" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡绫诲埆]]></simple-value></cell><cell expand="None" name="D1" row="1" col="4" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏁伴噺]]></simple-value></cell><cell expand="None" name="E1" row="1" col="5" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏁伴噺]]></simple-value></cell><cell expand="Down" name="A3" row="3" col="1" left-cell="root" top-cell="root"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="keyword" aggregate="group" property="name1" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="B3" row="3" col="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="keyword" aggregate="group" property="name2" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="C3" row="3" col="3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="keyword" aggregate="group" property="name3" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="D3" row="3" col="4"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="count" property="id" order="none" mapping-type="simple"><condition property="ZLLB" op="==" id="653999f0-b5d5-11ef-bdd2-7d0fb15468f5" type="property"><value><![CDATA[C3]]></value></condition></dataset-value></cell><cell expand="None" name="E3" row="3" col="5" left-cell="C3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="cgwjxx" aggregate="count" property="id" order="none" mapping-type="simple"><condition property="ZLLB" op="==" id="undefined" type="property"><value><![CDATA[C3]]></value></condition></dataset-value></cell><cell expand="None" name="A4" row="4" col="1" left-cell="A3" top-cell="root" col-span="3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bgcolor="92,184,92" bold="false" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍚堣]]></simple-value></cell><cell expand="None" name="D4" row="4" col="4" left-cell="A3" top-cell="root"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bgcolor="92,184,92" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><expression-value><![CDATA[sum(D3)]]></expression-value></cell><cell expand="None" name="E4" row="4" col="5" left-cell="A3" top-cell="root"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bgcolor="92,184,92" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><expression-value><![CDATA[sum(E3)]]></expression-value></cell><row row-number="1" height="18" band="title"/><row row-number="2" height="19" band="title"/><row row-number="3" height="18"/><row row-number="4" height="19"/><column col-number="1" width="122"/><column col-number="2" width="80"/><column col-number="3" width="80"/><column col-number="4" width="74"/><column col-number="5" width="74"/><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="keyword" type="sql"><sql><![CDATA[select a.param_name as name3 ,b.param_name as name2 , c.param_name as name1 from sys_keyword_param a LEFT JOIN sys_keyword_param b ON a.parent_id = b.param_id LEFT JOIN sys_keyword_param c ON (b.parent_id = c.param_id or a.parent_id = c.param_id )and c.parent_id = 0 where a.keyword_id = 1823280954771296257 and a.parent_id !=0 ]]></sql><field name="name3"/><field name="name2"/><field name="name1"/></dataset><dataset name="cgwjxx" type="sql"><sql><![CDATA[select a.id,b.ZLLB from cat_item_cgwjxx a LEFT JOIN cat_file_ajjxx b ON a.aj_id = b.id]]></sql><field name="id"/><field name="ZLLB"/></dataset><dataset name="ajjxx" type="sql"><sql><![CDATA[SELECT id, ZLLB FROM cat_file_ajjxx ]]></sql><field name="id"/><field name="ZLLB"/></dataset></datasource><paper type="A4" left-margin="90" right-margin="90"
+ top-margin="72" bottom-margin="72" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="landscape" html-report-align="left" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/catCgxx_tj.ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/catCgxx_tj.ureport.xml
new file mode 100644
index 0000000..632ee05
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/catCgxx_tj.ureport.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡绫诲埆]]></simple-value></cell><cell expand="None" name="B1" row="1" col="2" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡绫诲埆]]></simple-value></cell><cell expand="None" name="C1" row="1" col="3" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡绫诲埆]]></simple-value></cell><cell expand="None" name="D1" row="1" col="4" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[妗]></simple-value></cell><cell expand="None" name="E1" row="1" col="5" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浠禲]></simple-value></cell><cell expand="Down" name="A3" row="3" col="1" left-cell="root" top-cell="root"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="keyword" aggregate="group" property="name1" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="B3" row="3" col="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="keyword" aggregate="group" property="name2" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="C3" row="3" col="3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="keyword" aggregate="group" property="name3" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="D3" row="3" col="4"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="count" property="id" order="none" mapping-type="simple"><condition property="ZLLB" op="==" id="1d15c960-b1ec-11ef-adaa-59914be76865" type="property"><value><![CDATA[C3]]></value></condition></dataset-value></cell><cell expand="None" name="E3" row="3" col="5" left-cell="C3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="cgwjxx" aggregate="count" property="id" order="none" mapping-type="simple"><condition property="ZLLB" op="==" id="8480e520-b1ed-11ef-adaa-59914be76865" type="undefined"><value><![CDATA[C3]]></value></condition></dataset-value></cell><cell expand="None" name="A4" row="4" col="1" left-cell="A3" top-cell="root" col-span="3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bgcolor="92,184,92" bold="false" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍚堣]]></simple-value></cell><cell expand="None" name="D4" row="4" col="4" left-cell="A3" top-cell="root"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bgcolor="92,184,92" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><expression-value><![CDATA[sum(D3)]]></expression-value></cell><cell expand="None" name="E4" row="4" col="5" left-cell="A3" top-cell="root"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bgcolor="92,184,92" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><expression-value><![CDATA[sum(E3)]]></expression-value></cell><row row-number="1" height="18" band="title"/><row row-number="2" height="19" band="title"/><row row-number="3" height="18"/><row row-number="4" height="19"/><column col-number="1" width="122"/><column col-number="2" width="80"/><column col-number="3" width="80"/><column col-number="4" width="74"/><column col-number="5" width="74"/><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="keyword" type="sql"><sql><![CDATA[select a.param_name as name3 ,b.param_name as name2 , c.param_name as name1 from sys_keyword_param a LEFT JOIN sys_keyword_param b ON a.parent_id = b.param_id LEFT JOIN sys_keyword_param c ON (b.parent_id = c.param_id or a.parent_id = c.param_id )and c.parent_id = 0 where a.keyword_id = 1823280954771296257 and a.parent_id !=0 ]]></sql><field name="name3"/><field name="name2"/><field name="name1"/></dataset><dataset name="cgwjxx" type="sql"><sql><![CDATA[select a.id,b.id as aj_id,b.ZLLB from cat_item_cgwjxx a LEFT JOIN cat_file_ajjxx b ON a.aj_id = b.id]]></sql><field name="id"/><field name="aj_id"/><field name="ZLLB"/></dataset><dataset name="ajjxx" type="sql"><sql><![CDATA[SELECT id, ZLLB FROM cat_file_ajjxx ]]></sql><field name="id"/><field name="ZLLB"/></dataset></datasource><paper type="A4" left-margin="90" right-margin="90"
+ top-margin="72" bottom-margin="72" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="landscape" html-report-align="center" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/processing_approval_hn.ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/processing_approval_hn.ureport.xml
new file mode 100644
index 0000000..45b10a4
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/processing_approval_hn.ureport.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" col-span="13"><cell-style font-size="14" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"></cell-style><simple-value><![CDATA[婀栧崡鐪佽嚜鐒惰祫婧愬巺鏈哄叧妗f鍔犲伐鍗昡]></simple-value></cell><cell expand="None" name="A2" row="2" col="1" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[鐢宠鏃ユ湡锛歖]></simple-value></cell><cell expand="Down" name="C2" row="2" col="3" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" format="yyyy-MM-dd" align="left" valign="middle"></cell-style><dataset-value dataset-name="table3" aggregate="group" property="PROCESSING_DATE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="E2" row="2" col="5"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="F2" row="2" col="6"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="G2" row="2" col="7"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="H2" row="2" col="8"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="I2" row="2" col="9" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="right" valign="middle"></cell-style><simple-value><![CDATA[缂栧彿锛歖]></simple-value></cell><cell expand="Down" name="K2" row="2" col="11" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><dataset-value dataset-name="table3" aggregate="group" property="APPLY_CODE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A3" row="3" col="1" row-span="5"><cell-style font-size="18" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢�
+
+鎴�
+
+淇�
+
+鎭痌]></simple-value></cell><cell expand="None" name="B3" row="3" col="2" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[濮撳悕]]></simple-value></cell><cell expand="None" name="D3" row="3" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="PROCESSING_USER_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G3" row="3" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[宸ヤ綔鍗曚綅]]></simple-value></cell><cell expand="None" name="I3" row="3" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="DEPT_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="B4" row="4" col="2" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鑱旂郴鏂瑰紡]]></simple-value></cell><cell expand="None" name="D4" row="4" col="4"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢佃瘽]]></simple-value></cell><cell expand="None" name="E4" row="4" col="5" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="TEL_NUMBER" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G4" row="4" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎵嬫満]]></simple-value></cell><cell expand="None" name="I4" row="4" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="PROCESSING_TEL" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="B5" row="5" col="2" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[閭紪]]></simple-value></cell><cell expand="None" name="D5" row="5" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="POST_CODE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G5" row="5" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍗曚綅鍦板潃]]></simple-value></cell><cell expand="None" name="I5" row="5" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="DEPT_ADDRESS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="B6" row="6" col="2" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[韬唤璇佸彿]]></simple-value></cell><cell expand="None" name="D6" row="6" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="ID_CARD" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G6" row="6" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[娑夊瘑璇佸彿]]></simple-value></cell><cell expand="None" name="I6" row="6" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="CERTIFICATE_NUMBER" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="B7" row="7" col="2" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍒╃敤鐩殑]]></simple-value></cell><cell expand="None" name="D7" row="7" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="PROCESSING_PURPOSE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A8" row="8" col="1" col-span="13"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍒╃敤璇︽儏]]></simple-value></cell><cell expand="None" name="A9" row="9" col="1"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[搴忓彿]]></simple-value></cell><cell expand="None" name="B9" row="9" col="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[妗e彿]]></simple-value></cell><cell expand="None" name="C9" row="9" col="3" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浠跺彿]]></simple-value></cell><cell expand="None" name="E9" row="9" col="5" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏂囦欢鍚峕]></simple-value></cell><cell expand="None" name="H9" row="9" col="8"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[瀵嗙骇]]></simple-value></cell><cell expand="None" name="I9" row="9" col="9" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[娑夊瘑椤电爜]]></simple-value></cell><cell expand="None" name="K9" row="9" col="11"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍔犲伐鏂瑰紡]]></simple-value></cell><cell expand="None" name="L9" row="9" col="12" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏁伴噺]]></simple-value></cell><cell expand="None" name="A10" row="10" col="1" left-cell="C10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><expression-value><![CDATA[row() - 9]]></expression-value></cell><cell expand="Down" name="B10" row="10" col="2" left-cell="C10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ARCHIVAL_CODE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="C10" row="10" col="3" left-cell="root" top-cell="root" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ITEM_NUMBER" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="E10" row="10" col="5" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ITEM_TITLE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="H10" row="10" col="8" left-cell="C10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="Down" name="I10" row="10" col="9" left-cell="C10" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="SECURITY_PAGE_NUM" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="K10" row="10" col="11" left-cell="C10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢靛瓙]]></simple-value></cell><cell expand="None" name="L10" row="10" col="12" left-cell="C10" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[1]]></simple-value></cell><cell expand="None" name="A11" row="11" col="1" col-span="13"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍚堣]]></simple-value></cell><cell expand="None" name="A12" row="12" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢靛瓙鏂囦欢澶嶅埗鎬婚噺锛歖]></simple-value></cell><cell expand="None" name="D12" row="12" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[346:MB,鍏朵腑鍥炬枃鏁板瓧鍖栵細0浠斤紝鏁版嵁閲�0.00MB,鍘熷璧勬枡澶嶅埗鏁伴噺锛�0.00MB銆俔]></simple-value></cell><cell expand="None" name="A13" row="13" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡鍔犲伐缁忓姙浜篯]></simple-value></cell><cell expand="None" name="D13" row="13" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浣曞嘲]]></simple-value></cell><cell expand="None" name="G13" row="13" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[閮ㄩ棬棰嗗]]></simple-value></cell><cell expand="None" name="I13" row="13" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[瀛欑珛鍚塢]></simple-value></cell><cell expand="None" name="A14" row="14" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏈嶅姟绐楀彛缁忓姙浜篯]></simple-value></cell><cell expand="None" name="D14" row="14" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[浣曞嘲]]></simple-value></cell><cell expand="None" name="G14" row="14" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏀舵浜篯]></simple-value></cell><cell expand="None" name="I14" row="14" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A15" row="15" col="1" row-span="5" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜虹鍚峕]></simple-value></cell><cell expand="None" name="D15" row="15" col="4" row-span="3" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 鏈汉鎸佹湁鍗曚綅娑夊瘑璇侊紝绯诲崟浣嶇‘璁ゅ彲鍊熼槄澶嶅埗娑夊瘑娑夊瘑鍦拌川璧勬枡浜哄憳锛屽皢涓ユ牸閬靛畧鈥滃�熼槄澶嶅埗娑夊瘑鍦拌川璧勬枡鍗曚綅鎵胯鈥濓紱濡ュ杽淇濈濂藉湴璐ㄨ祫鏂欍�俔]></simple-value></cell><cell expand="None" name="D18" row="18" col="4"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="E18" row="18" col="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="F18" row="18" col="6"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="G18" row="18" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="H18" row="18" col="8" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"></cell-style><simple-value><![CDATA[鐢宠浜猴細]]></simple-value></cell><cell expand="None" name="K18" row="18" col="11" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[骞� 鏈� 鏃]></simple-value></cell><cell expand="None" name="D19" row="19" col="4"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="E19" row="19" col="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="F19" row="19" col="6"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="G19" row="19" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="H19" row="19" col="8" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[棰嗗彇浜猴細]]></simple-value></cell><cell expand="None" name="K19" row="19" col="11" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[骞� 鏈� 鏃]></simple-value></cell><row row-number="1" height="26" band="title"/><row row-number="2" height="27" band="title"/><row row-number="3" height="27" band="title"/><row row-number="4" height="26" band="title"/><row row-number="5" height="26" band="title"/><row row-number="6" height="25" band="title"/><row row-number="7" height="29" band="title"/><row row-number="8" height="26" band="title"/><row row-number="9" height="26"/><row row-number="10" height="25"/><row row-number="11" height="27"/><row row-number="12" height="27" band="summary"/><row row-number="13" height="24" band="summary"/><row row-number="14" height="24" band="summary"/><row row-number="15" height="22" band="summary"/><row row-number="16" height="20" band="summary"/><row row-number="17" height="19" band="summary"/><row row-number="18" height="15" band="summary"/><row row-number="19" height="16" band="summary"/><column col-number="1" width="34"/><column col-number="2" width="47"/><column col-number="3" width="38"/><column col-number="4" width="40"/><column col-number="5" width="64"/><column col-number="6" width="38"/><column col-number="7" width="50"/><column col-number="8" width="44"/><column col-number="9" width="44"/><column col-number="10" width="43"/><column col-number="11" width="45"/><column col-number="12" width="25"/><column col-number="13" width="28"/><footer font-family="瀹嬩綋" font-size="10" forecolor="0,0,0" margin="23"><center><![CDATA["绗�"+page()+"椤�,鍏�"+pages()+"椤�"]]></center></footer><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="table2" type="sql"><sql><![CDATA[SELECT
+ ARCHIVAL_CODE,
+ FILE_TITLE,
+ ITEM_TITLE,
+ ITEM_NUMBER,
+ SECURITY_PAGE_NUM,
+ DEPT_NAME锛�
+ case when DOWNLOAD = '1' and AGREE = '1' then '鈭�'
+ else '' end as DOWNLOAD,
+ case when PRINT = '1' and AGREE = '1' then '鈭�'
+ else '' end as PRINT
+ FROM UTL_PROCESSING_DETAIL WHERE FORM_ID = (:formId)]]></sql><field name="ARCHIVAL_CODE"/><field name="FILE_TITLE"/><field name="ITEM_TITLE"/><field name="ITEM_NUMBER"/><field name="SECURITY_PAGE_NUM"/><field name="DEPT_NAME"/><field name="DOWNLOAD"/><field name="PRINT"/><parameter name="formId" type="String" default-value="-1"/></dataset><dataset name="table3" type="sql"><sql><![CDATA[select * from UTL_PROCESSING_FORM where FORM_ID =(:formId)]]></sql><field name="FORM_ID"/><field name="APPLY_CODE"/><field name="PROCESSING_TYPE"/><field name="PROCESSING_USER_ID"/><field name="PROCESSING_USER_NAME"/><field name="POST_CODE"/><field name="CERTIFICATE_NUMBER"/><field name="TEL_NUMBER"/><field name="PROCESSING_TEL"/><field name="PROCESSING_DATE"/><field name="PROCESSING_VALID_DATE"/><field name="PROCESSING_PURPOSE"/><field name="REMARK"/><field name="STATE"/><field name="SECURITY_CLASSIFICATION"/><field name="DEPT_NAME"/><field name="DEPT_ADDRESS"/><field name="PROJECT_TYPE"/><field name="PROJECT_NAME"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="CREATE_TIME"/><field name="MODIFY_TIME"/><field name="CREATE_DEPT_ID"/><field name="CREATE_DEPT_NAME"/><field name="SECURITY_CODE"/><field name="DELETE_STATE"/><field name="DELETE_TIME"/><field name="FULLTEXT_STATE"/><field name="FLOW_STATE"/><field name="PROCESS_INSTANCE_ID"/><field name="FLOW_STEP"/><field name="FILE_COUNT"/><field name="ITEM_COUNT"/><field name="ID_CARD"/><field name="OTHER_APPLY"/><parameter name="formId" type="String" default-value="-1"/></dataset></datasource><paper type="A4" left-margin="28" right-margin="28"
+ top-margin="57" bottom-margin="43" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="portrait" html-report-align="center" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/test.ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/test.ureport.xml
new file mode 100644
index 0000000..66385aa
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/test.ureport.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[搴忓彿]]></simple-value></cell><cell expand="None" name="B1" row="1" col="2" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎶ュ憡鍚嶇О]]></simple-value></cell><cell expand="None" name="C1" row="1" col="3" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎶ュ憡缂栧埗鍗曚綅]]></simple-value></cell><cell expand="None" name="D1" row="1" col="4" row-span="2"><cell-style font-size="10" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鑱旂郴濮撳悕]]></simple-value></cell><cell expand="None" name="E1" row="1" col="5" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鑱旂郴鐢佃瘽]]></simple-value></cell><cell expand="None" name="F1" row="1" col="6" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗竴娆★紙鏂版帴鏀讹級]]></simple-value></cell><cell expand="None" name="H1" row="1" col="8" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗簩娆]></simple-value></cell><cell expand="None" name="J1" row="1" col="10" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗笁娆]></simple-value></cell><cell expand="None" name="L1" row="1" col="12" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗洓娆]></simple-value></cell><cell expand="None" name="N1" row="1" col="14" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绗簲娆]></simple-value></cell><cell expand="None" name="P1" row="1" col="16" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[棣嗗唴楠屾敹浜篯]></simple-value></cell><cell expand="None" name="Q1" row="1" col="17" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎬讳慨鏀规鏁癩]></simple-value></cell><cell expand="None" name="R1" row="1" col="18" row-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎬讳綋楠屾敹鎯呭喌]]></simple-value></cell><cell expand="None" name="F2" row="2" col="6"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="G2" row="2" col="7"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="None" name="H2" row="2" col="8"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="I2" row="2" col="9"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="None" name="J2" row="2" col="10"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="K2" row="2" col="11"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="None" name="L2" row="2" col="12"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="M2" row="2" col="13"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="None" name="N2" row="2" col="14"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎺ユ敹鏃堕棿]]></simple-value></cell><cell expand="None" name="O2" row="2" col="15"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[楠屾敹鏃堕棿]]></simple-value></cell><cell expand="Down" name="A3" row="3" col="1" left-cell="B3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><expression-value><![CDATA[return row() - 2]]></expression-value></cell><cell expand="Down" name="B3" row="3" col="2" left-cell="root" top-cell="root"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="ZLMC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="C3" row="3" col="3"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="XCDWMC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="D3" row="3" col="4"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="HJRMC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="E3" row="3" col="5"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="HJRLXFS" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="F3" row="3" col="6" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="ACCEPT_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="undefined" type="property" join="and"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="undefined" type="property" join="and"><value><![CDATA[1]]></value></condition></dataset-value><condition-property-item name="ss"><cell-style for-condition="true" font-size-scope="cell" forecolor-scope="cell" font-family-scope="cell" bgcolor-scope="cell" bold-scope="cell" italic-scope="cell" underline-scope="cell" align-scope="cell" valign-scope="cell"></cell-style></condition-property-item></cell><cell expand="None" name="G3" row="3" col="7" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="CHECK_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="undefined" type="property" join="and"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="undefined" type="property" join="and"><value><![CDATA[1]]></value></condition></dataset-value></cell><cell expand="None" name="H3" row="3" col="8" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="ACCEPT_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="undefined" type="property" join="and"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="undefined" type="property" join="and"><value><![CDATA[2]]></value></condition></dataset-value></cell><cell expand="None" name="I3" row="3" col="9" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="select" property="CHECK_DATE" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="undefined" type="property" join="and"><value><![CDATA[ajjxx.select(id)]]></value></condition><condition property="TIME" op="==" id="undefined" type="property" join="and"><value><![CDATA[2]]></value></condition></dataset-value></cell><cell expand="None" name="J3" row="3" col="10"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="K3" row="3" col="11"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="L3" row="3" col="12"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="M3" row="3" col="13"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="N3" row="3" col="14"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="O3" row="3" col="15"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="Down" name="P3" row="3" col="16" left-cell="B3"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="ajjxx" aggregate="select" property="YSR" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="Q3" row="3" col="17"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="time" aggregate="max" property="TIME" order="none" mapping-type="simple"><condition property="AJ_ID" op="==" id="undefined" type="property"><value><![CDATA[ajjxx.select(id)]]></value></condition></dataset-value></cell><cell expand="None" name="R3" row="3" col="18"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><row row-number="1" height="18" band="title"/><row row-number="2" height="19" band="title"/><row row-number="3" height="18"/><column col-number="1" width="35"/><column col-number="2" width="122"/><column col-number="3" width="80"/><column col-number="4" width="80"/><column col-number="5" width="74"/><column col-number="6" width="70"/><column col-number="7" width="63"/><column col-number="8" width="58"/><column col-number="9" width="60"/><column col-number="10" width="65"/><column col-number="11" width="66"/><column col-number="12" width="74"/><column col-number="13" width="74"/><column col-number="14" width="74"/><column col-number="15" width="74"/><column col-number="16" width="74"/><column col-number="17" width="74"/><column col-number="18" width="74"/><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="ajjxx" type="sql"><sql><![CDATA[select * from cat_file_ajjxx]]></sql><field name="ID"/><field name="ZLLY"/><field name="HJRDH"/><field name="SGDH"/><field name="DH"/><field name="BZSDH"/><field name="HJZSDW"/><field name="BSSJ"/><field name="ZSDWAJH"/><field name="JSRQ"/><field name="JSDWMC"/><field name="BGDWMC"/><field name="ZLMC"/><field name="FZMC"/><field name="BZZ"/><field name="ZLLB"/><field name="ZLLBDM"/><field name="YZ"/><field name="GZCD"/><field name="QTGZCD"/><field name="GZFF"/><field name="SPSJ"/><field name="SMQK"/><field name="MJ"/><field name="SFBH"/><field name="BHQ"/><field name="BHSX"/><field name="HJPZH"/><field name="FZRQ"/><field name="FBRQ"/><field name="GJZ"/><field name="NRZY"/><field name="BGQX"/><field name="BZ"/><field name="HJRMC"/><field name="HJRDZ"/><field name="HJRTYSHXYDM"/><field name="HJRYB"/><field name="HJRLXR"/><field name="HJRLXFS"/><field name="HJRDZYX"/><field name="QSJD_FX"/><field name="QSJD_DU"/><field name="QSJD_FEN"/><field name="QSJD_MIAO"/><field name="ZZJD_FX"/><field name="ZZJD_DU"/><field name="ZZJD_FEN"/><field name="ZZJD_MIAO"/><field name="QSWD_FX"/><field name="QSWD_DU"/><field name="QSWD_FEN"/><field name="QSWD_MIAO"/><field name="ZZWD_FX"/><field name="ZZWD_DU"/><field name="ZZWD_FEN"/><field name="ZZWD_MIAO"/><field name="GDZB"/><field name="DLZBX"/><field name="XZQMC"/><field name="XZQDM"/><field name="KCDM"/><field name="KCMC"/><field name="DDGZWZ"/><field name="CKD"/><field name="ZYKZ"/><field name="CKSD"/><field name="CYLX"/><field name="ZYCGJS"/><field name="YDZWJGSJBB"/><field name="YJHJ"/><field name="RJHJ"/><field name="TJXTKZKTYSM"/><field name="QTSM"/><field name="ZWZZJS"/><field name="SPZZJS"/><field name="FTZZJS"/><field name="FBZZJS"/><field name="FJZZJS"/><field name="QTZJS"/><field name="HDS"/><field name="ZWDZJS"/><field name="SPDZJS"/><field name="FTDZJS"/><field name="FBDZJS"/><field name="FJDZJS"/><field name="RJDZJS"/><field name="SJKDZJS"/><field name="DMTDZJS"/><field name="QTDZJS"/><field name="CGZLSJL"/><field name="CGZLDZWJZS"/><field name="CGZLDZJS"/><field name="CGZLZZJS"/><field name="CGZLDZWJJZS"/><field name="DZZJS"/><field name="CZZJS"/><field name="GZZJS"/><field name="TZZJS"/><field name="YZZJS"/><field name="SZZJS"/><field name="LZZJS"/><field name="XZZJS"/><field name="ZZZJS"/><field name="WZZJS"/><field name="DDZJS"/><field name="CDZJS"/><field name="GDZJS"/><field name="TDZJS"/><field name="YDZJS"/><field name="SDZJS"/><field name="LDZJS"/><field name="XDZJS"/><field name="ZDZJS"/><field name="WDZJS"/><field name="YSDZSJL"/><field name="SWDH"/><field name="SWZLLB"/><field name="SWZLBCDW"/><field name="ZKSL"/><field name="ZJC"/><field name="YXZSL"/><field name="YXIZSL"/><field name="BBZSL"/><field name="YPZSL"/><field name="GPZSL"/><field name="BPZSL"/><field name="QTSWMC"/><field name="SWBZ"/><field name="QTSWSL"/><field name="XMKYQXZ"/><field name="XMKYQLX"/><field name="XMKYQMC"/><field name="XMKYQBH"/><field name="QSSJ"/><field name="ZZSJ"/><field name="XMZGJGMC"/><field name="XMCDDWKYQR"/><field name="XMFZR"/><field name="ZJLY"/><field name="XMXXSM"/><field name="XCDWMC"/><field name="XZDWDZ"/><field name="XZDWYB"/><field name="XZDWXYDM"/><field name="XZDWYX"/><field name="XZDWLXR"/><field name="XZDWLXRDH"/><field name="YSJZSJ"/><field name="SLR"/><field name="SLSJ"/><field name="CJSJ"/><field name="ZLZT"/><field name="ZLUZT"/><field name="FBZT"/><field name="YSR"/><field name="YSWSJ"/><field name="PZXXLRZT"/><field name="FBFSJ"/><field name="FBR"/><field name="ZWYDZJS"/><field name="SPYDZJS"/><field name="FTYDZJS"/><field name="FBYDZJS"/><field name="FJYDZJS"/><field name="RJYDZJS"/><field name="SJKYDZJS"/><field name="DMTYDZJS"/><field name="QTYDZJS"/><field name="ZWCDDZJS"/><field name="SPCDDZJS"/><field name="FTCDDZJS"/><field name="FBCDDZJS"/><field name="FJCDDZJS"/><field name="RJCDDZJS"/><field name="SJKCDDZJS"/><field name="DMTCDDZJS"/><field name="QTCDDZJS"/><field name="QTZZJS"/><field name="YSZLDZJS"/><field name="YSZLSJL"/><field name="YSZLDZWJZS"/><field name="YSZLDZWJJZS"/><field name="YSZLZZJS"/><field name="create_dept_name"/><field name="create_dept_id"/><field name="modify_time"/><field name="create_time"/><field name="create_user_name"/><field name="create_user_id"/><field name="delete_state"/><field name="fulltext_state"/><field name="XCSJ"/><field name="SPJG"/><field name="XCDWSHXYDM"/><field name="DLWZS"/></dataset><dataset name="time" type="sql"><sql><![CDATA[select * from cat_check]]></sql><field name="ID"/><field name="AJ_ID"/><field name="ACCEPT_DATE"/><field name="CHECK_DATE"/><field name="TIME"/><field name="create_user_id"/><field name="create_user_name"/><field name="create_time"/><field name="modify_time"/><field name="create_dept_id"/><field name="create_dept_name"/></dataset></datasource><paper type="A4" left-margin="90" right-margin="90"
+ top-margin="72" bottom-margin="72" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="landscape" html-report-align="left" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ureportfiles/utilization_user_ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/utilization_user_ureport.xml
new file mode 100644
index 0000000..a09092c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/ureportfiles/utilization_user_ureport.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" col-span="2"><cell-style font-size="12" forecolor="0,0,0" font-family="寰蒋闆呴粦" bold="true" align="center" valign="middle"></cell-style><simple-value><![CDATA[鍊熼槄绯荤粺鐧诲綍淇℃伅鏉]></simple-value></cell><cell expand="None" name="A2" row="2" col="1"><cell-style font-size="10" font-family="寰蒋闆呴粦" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 鐧诲綍鍚嶇О锛歖]></simple-value></cell><cell expand="Down" name="B2" row="2" col="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="UserCheck" aggregate="group" property="LOGIN_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A3" row="3" col="1"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 鐧诲綍瀵嗙爜锛歖]></simple-value></cell><cell expand="Down" name="B3" row="3" col="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="UserCheck" aggregate="group" property="PASSWORD" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A4" row="4" col="1"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 濮� 鍚嶏細]]></simple-value></cell><cell expand="Down" name="B4" row="4" col="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="UserCheck" aggregate="group" property="USER_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A5" row="5" col="1"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 宸ヤ綔鍗曚綅锛歖]></simple-value></cell><cell expand="Down" name="B5" row="5" col="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="UserCheck" aggregate="group" property="DEPT_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A6" row="6" col="1"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 娑夊瘑鏉冮檺锛歖]></simple-value></cell><cell expand="Down" name="B6" row="6" col="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="UserCheck" aggregate="group" property="SECURITY" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A7" row="7" col="1"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 鏈� 鏁� 鏈燂細]]></simple-value></cell><cell expand="Down" name="B7" row="7" col="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="UserCheck" aggregate="group" property="data" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A8" row="8" col="1" row-span="2" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="bottom"></cell-style><simple-value><![CDATA[ 鍊熼槄椤荤煡锛歖]></simple-value></cell><cell expand="None" name="A10" row="10" col="1" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"></cell-style><simple-value><![CDATA[1锛庤灏嗛殢韬惡甯︾殑鍖呫�佺浉鏈恒�佹墜鏈恒�佺瑪璁版湰鐢佃剳绛変笌鍊熼槄鏃犲叧鐨勭墿鍝佸瘎鏀惧瓨鍖呭銆俔]></simple-value></cell><cell expand="None" name="A11" row="11" col="1" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"></cell-style><simple-value><![CDATA[2锛庨槄瑙堝绂佹鎷嶇収锛岀姝㈠皢绾歌川璧勬枡甯﹀嚭闃呰瀹ゃ�俔]></simple-value></cell><cell expand="None" name="A12" row="12" col="1" col-span="2"><cell-style font-size="10" forecolor="0,0,0" font-family="寰蒋闆呴粦" align="left" valign="middle"></cell-style><simple-value><![CDATA[3锛庤娉ㄦ剰鑷韩浠〃锛屽嬁鐫�姹楄儗蹇冦�佺┛鎷栭瀷鍏ラ锛岄鍐呬弗绂佸惛鐑熴�俔]></simple-value></cell><row row-number="1" height="20" band="title"/><row row-number="2" height="20"/><row row-number="3" height="20"/><row row-number="4" height="20"/><row row-number="5" height="20"/><row row-number="6" height="20"/><row row-number="7" height="20"/><row row-number="8" height="11"/><row row-number="9" height="8"/><row row-number="10" height="20"/><row row-number="11" height="20"/><row row-number="12" height="20"/><column col-number="1" width="56"/><column col-number="2" width="355"/><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="UserCheck" type="sql"><sql><![CDATA[select a.LOGIN_NAME,a.USER_NAME,b.PASSWORD, a.DEPT_NAME,b.SECURITY,to_char(VALID_START, 'YYYY-MM-DD')||'鑷�'||to_char(VALID_END, 'YYYY-MM-DD') as data from UTL_USER_CHECK a LEFT JOIN UTL_UTILIZATION_USER b on a.utilization_user_id = b.ID where a.id =:id]]></sql><field name="LOGIN_NAME"/><field name="USER_NAME"/><field name="PASSWORD"/><field name="DEPT_NAME"/><field name="SECURITY"/><field name="DATA"/><parameter name="id" type="String" default-value="1135188211480395776"/></dataset></datasource><paper type="A4" left-margin="90" right-margin="90"
+ top-margin="72" bottom-margin="72" paging-mode="fitpage" fixrows="0"
+ width="595" height="842" orientation="portrait" html-report-align="center" bg-image="" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp b/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp
index 91080b6..7395933 100644
--- a/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp
@@ -148,9 +148,6 @@
style="width:310px"
value="${borrowForm.deptAddress}"
data-options="tipPosition:'bottom'"/>
- <input type="hidden" id="utilizationMethod" name="utilizationMethod" type="text"
- style="width:310px" value="${borrowForm.utilizationMethod}"
- readonly/>
</td>
</tr>
<tr>
@@ -185,13 +182,19 @@
value="${borrowForm.borrowTel}"
data-options="tipPosition:'bottom'" readonly/>
</td>
- <td class="tbtitle">娑夊瘑璇佷功缂栧彿:</td>
+<%-- <td class="tbtitle">娑夊瘑璇佷功缂栧彿:</td>--%>
+<%-- <td>--%>
+<%-- <input class="easyui-textbox" id="certificateNumber" name="certificateNumber"--%>
+<%-- type="text"--%>
+<%-- style="width:310px"--%>
+<%-- value="${borrowForm.certificateNumber}"--%>
+<%-- data-options="tipPosition:'bottom'" readonly/>--%>
+<%-- </td>--%>
+ <td class="tbtitle">鏄惁閫氳繃娴佺▼:</td>
<td>
- <input class="easyui-textbox" id="certificateNumber" name="certificateNumber"
- type="text"
- style="width:310px"
- value="${borrowForm.certificateNumber}"
- data-options="tipPosition:'bottom'" readonly/>
+ <input type="hidden" id="utilizationMethod" name="utilizationMethod" type="text"
+ style="width:310px" value="${borrowForm.utilizationMethod}"
+ readonly/>
</td>
</tr>
<tr>
@@ -352,7 +355,7 @@
<button class="pt-btn pt-btn-primary" onclick="dealFlow()">娴佺▼鍔炵悊</button>
</c:if>
<%-- <c:if test="${borrowForm.flowState==1}">--%>
- <%-- <button class="pt-btn pt-btn-warning" onclick="reportPrinting()"><i class="fa fa-map-o"></i>鎵撳嵃鍊熼槄鍗�--%>
+ <button class="pt-btn pt-btn-warning" onclick="reportPrinting()"><i class="fa fa-map-o"></i>鎵撳嵃鍊熼槄鍗�
<%-- </button>--%>
<%-- </c:if>--%>
<button class="pt-btn pt-btn-default" onclick="closeWindow()">鍏抽棴</button>
diff --git a/src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp b/src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp
index 92d2d05..04df825 100644
--- a/src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp
@@ -184,30 +184,30 @@
</td>
</tr>
-<%-- <tr>--%>
-<%-- <td class="tbtitle">鍙栨牱鏂瑰紡锛�</td>--%>
-<%-- <td colspan="3">--%>
-<%-- <input class="easyui-textbox" name="sampleMethod"--%>
-<%-- data-options="multiline:true"--%>
-<%-- style="height:60px;width:850px" value="${physicalForm.sampleMethod}"/>--%>
-<%-- </td>--%>
-<%-- </tr>--%>
-<%-- <tr>--%>
-<%-- <td class="tbtitle">娴嬭瘯椤圭洰鍙婃牱鍝侀噺闇�姹傦細</td>--%>
-<%-- <td colspan="3">--%>
-<%-- <input class="easyui-textbox" name="testProject"--%>
-<%-- data-options="multiline:true"--%>
-<%-- style="height:60px;width:850px" value="${physicalForm.testProject}"/>--%>
-<%-- </td>--%>
-<%-- </tr>--%>
-<%-- <tr>--%>
-<%-- <td class="tbtitle">閫佹鏈烘瀯锛�</td>--%>
-<%-- <td colspan="3">--%>
-<%-- <input class="easyui-textbox" name="sendInstitution"--%>
-<%-- data-options="multiline:true"--%>
-<%-- style="height:60px;width:850px" value="${physicalForm.sendInstitution}"/>--%>
-<%-- </td>--%>
-<%-- </tr>--%>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">鍙栨牱鏂瑰紡锛�</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="sampleMethod"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.sampleMethod}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">娴嬭瘯椤圭洰鍙婃牱鍝侀噺闇�姹傦細</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="testProject"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.testProject}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">閫佹鏈烘瀯锛�</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="sendInstitution"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.sendInstitution}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
<tr>
<td class="tbtitle">鐢宠鐩殑鍙婂埄鐢ㄦ垚鏁堬細</td>
<td colspan="3">
@@ -216,14 +216,14 @@
style="height:60px;width:850px" value="${physicalForm.researchPurpose}"/>
</td>
</tr>
-<%-- <tr>--%>
-<%-- <td class="tbtitle">鐮旂┒鍐呭锛�</td>--%>
-<%-- <td colspan="3">--%>
-<%-- <input class="easyui-textbox" name="researchContent"--%>
-<%-- data-options="multiline:true"--%>
-<%-- style="height:60px;width:850px" value="${physicalForm.researchContent}"/>--%>
-<%-- </td>--%>
-<%-- </tr>--%>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">鐮旂┒鍐呭锛�</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="researchContent"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.researchContent}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
<tr>
<td class="tbtitle">棰勬湡鎴愭灉锛�</td>
<td colspan="3">
@@ -232,14 +232,14 @@
style="height:60px;width:850px" value="${physicalForm.expectedResult}"/>
</td>
</tr>
-<%-- <tr>--%>
-<%-- <td class="tbtitle">鐢宠鍗曚綅鎰忚锛�</td>--%>
-<%-- <td colspan="3">--%>
-<%-- <input class="easyui-textbox" name="applyDeptOpinion"--%>
-<%-- data-options="multiline:true"--%>
-<%-- style="height:60px;width:850px" value="${physicalForm.applyDeptOpinion}"/>--%>
-<%-- </td>--%>
-<%-- </tr>--%>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">鐢宠鍗曚綅鎰忚锛�</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="applyDeptOpinion"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.applyDeptOpinion}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
</table>
</form>
</div>
@@ -373,10 +373,10 @@
<c:if test="${task!=null || approvePermission}">
<button class="pt-btn pt-btn-primary" onclick="dealFlow()">娴佺▼鍔炵悊</button>
</c:if>
- <c:if test="${physicalForm.flowState==1}">
- <button class="pt-btn pt-btn-warning" onclick="reportPrinting()"><i class="fa fa-map-o"></i>鎵撳嵃瀹炵墿鍒╃敤鍗�
- </button>
- </c:if>
+
+ <button class="pt-btn pt-btn-warning" onclick="reportPrinting()"><i class="fa fa-map-o"></i>鎵撳嵃瀹炵墿鍒╃敤鍗�
+ </button>
+
<button class="pt-btn pt-btn-default" onclick="closeWindow()">鍏抽棴</button>
</div>
</div>
@@ -893,15 +893,10 @@
//鎵撳嵃瀹炵墿鍒╃敤鍗�
function reportPrinting() {
- var flag = ${archivesUtilizationForm.utilizationType==1};
- // var reportFile = "borrow_approval.ureport.xml";
- var reportFile = "borrow_approval_hn.ureport.xml";
- if (flag) {
- // reportFile = "borrow_approval_sampling.ureport.xml";
- reportFile = "borrow_approval_hn.ureport.xml";
- }
+
+ var reportFile = "borrow_approval_gh.ureport.xml";
var path = "<%=path%>";
- var url = path + "/ureport/preview?_u=file:" + reportFile + "&_i=1&formId=" + '${archivesUtilizationForm.formId}';
+ var url = path + "/ureport/preview?_u=file:" + reportFile + "&_i=1&formId=" + '${physicalForm.formId}';
window.open(url);
}
--
Gitblit v1.9.1