[fix]工作流监控

src/main/webapp/WEB-INF/classes/cont/CON3100N/csh_write_detail_report.lwm

@@ -82,9 +82,9 @@
         <bm:query-field name="transaction_date_to" queryExpression="trunc(t.transaction_date) &lt;=  trunc(to_date(${@transaction_date_to},'yyyy-mm-dd'))"/>
         <bm:query-field name="journal_date_from" queryExpression="trunc(t.write_off_date) &gt;=  trunc(to_date(${@journal_date_from},'yyyy-mm-dd'))"/>
         <bm:query-field name="journal_date_to" queryExpression="trunc(t.write_off_date) &lt;=  trunc(to_date(${@journal_date_to},'yyyy-mm-dd'))"/>
-        <bm:query-field name="transaction_num" queryExpression="t.transaction_number like &apos;%&apos; || ${@transaction_num} || &apos;%&apos;"/>
+        <bm:query-field name="transaction_num" queryExpression="t.transaction_num like &apos;%&apos; || ${@transaction_num} || &apos;%&apos;"/>
         <bm:query-field name="cf_item_n" queryExpression="t.cf_item_n like &apos;%&apos; || ${@cf_item_n} || &apos;%&apos;"/>
-        <bm:query-field name="extra_nam" queryExpression="t.extra_name like &apos;%&apos; || ${@extra_nam} || &apos;%&apos;"/>
+        <bm:query-field name="extra_nam" queryExpression="t.extra_nam like &apos;%&apos; || ${@extra_nam} || &apos;%&apos;"/>
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter enforceOperations="query" expression="exists (select 1 from aut_trx_user_authorize a1, aut_owner_user_authorize a2 WHERE a1.trx_category = 'CONTRACT' and a1.trx_id = t.contract_id AND trunc(sysdate) between a1.start_date AND nvl(a1.end_date, trunc(sysdate)) and a1.user_id = a2.owner_user_id AND a1.trx_category = a2.trx_category AND a2.authorized_user_id = ${/session/@user_id} AND trunc(sysdate) between a2.start_date and nvl(a2.end_date, trunc(sysdate)))"/>

src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_query.lwm

@@ -243,7 +243,7 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="contract_status" enforceOperations="query"
-                        expression="t1.contract_status = &apos;INCEPT&apos;"/>
+                        expression="t1.contract_status in ( &apos;INCEPT&apos;, &apos;PENDING&apos;)"/>
         <!-- <bm:data-filter name="overdue_days" enforceOperations="query" expression="t1.overdue_days &gt; 0"/> -->
         <!-- <bm:data-filter enforceOperations="query" expression="exists (select 1 from con_contract_cashflow where contract_id = t1.contract_id and cf_type = 9 and due_amount != nvl(received_amount,0) and generated_source not in (&apos;CREATE&apos;))"/> -->
         <bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>

src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm

@@ -55,6 +55,6 @@
         <bm:query-field name="approve_user_code" queryExpression="t1.approve_user_code like ${@approve_user_code}"/>
     </bm:query-fields>
     <bm:data-filters>
-        <bm:data-filter name="query" expression="( (${/session/@role_id} = 2306 and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (2314, 2313, 2312) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} not in (2306, 2314, 2313, 2312) and 1 = 1))"/>
+        <bm:data-filter name="query" expression="( (${/session/@role_id} = 2306 and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (2314, 2313, 2312) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} = 2305 and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} not in (2306, 2314, 2313, 2312, 2305) and 1 = 1))"/>
     </bm:data-filters>
 </bm:model>

src/main/webapp/modules/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lview

@@ -3,7 +3,7 @@
     <a:init-procedure>
         <a:model-query defaultWhereClause="v.code=&apos;ZJ_WFL_WORKFLOW_STATUS&apos; and v.code_value = &apos;1&apos;" model="zjwfl.sys_code_default_value" rootPath="workflow_status_default_value"/>
         <a:model-query defaultWhereClause="v.code=&apos;ZJ_WFL_WORKFLOW_STATUS&apos; and v.code_value in (&apos;1&apos;,&apos;10&apos;,&apos;-1&apos;,&apos;-1000&apos;)" model="zjwfl.sys_code_default_value" rootPath="workflow_status_list"/>
-        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;0014&apos;,&apos;0013&apos;,&apos;0012&apos;,&apos;0006&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
+        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;0014&apos;,&apos;0013&apos;,&apos;0012&apos;,&apos;0006&apos;,&apos;0005&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
     </a:init-procedure>
     <a:view>
         <a:link id="pageLink_node_approve_history" url="${/request/@context_path}/modules/zjwfl/ZJWFL1060/zj_wfl_monitoring_node_approve_history.lview"/>