保证金划转新增复核状态

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_query.lwm

@@ -26,9 +26,14 @@
         </bm:operation>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-            select * from ( select v1.contract_id,
-            (select cc.contract_number from con_contract cc where cc.contract_id=v1.contract_id)contract_number,
-            (select cc.contract_name from con_contract cc where cc.contract_id=v1.contract_id)contract_name,
+           select *
+  from (select v1.contract_id,
+               (select cc.contract_number
+                  from con_contract cc
+                 where cc.contract_id = v1.contract_id) contract_number,
+               (select cc.contract_name
+                  from con_contract cc
+                 where cc.contract_id = v1.contract_id) contract_name,
                --to_char(v1.unwrite_off_amount,'FM999,999,999,990.00')unwrite_off_amount,
                v1.unwrite_off_amount,
                v1.deposit_trans_type,
@@ -36,8 +41,8 @@
                   from hls_bp_master t, con_contract ct
                  where t.bp_id = ct.bp_id_tenant
                    and ct.contract_id = v1.contract_id) bp_id_telnet_n,
-       (select ct.bp_id_agent_level1 from
-         con_contract ct
+               (select ct.bp_id_agent_level1
+                  from con_contract ct
                  where contract_id = v1.contract_id) bp_id_agent_level1,
                (select t.bp_name
                   from hls_bp_master t, con_contract ct
@@ -47,13 +52,31 @@
                   from sys_code_values_v v
                  where v.code = 'DEPOSIT_TRANS_TYPE'
                    and v.code_value = v1.deposit_trans_type) deposit_trans_type_n,
-          nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id=>v1.contract_id,p_user_id=>1) ),'正常')approve_status,
-       v1.bp_id
-
+               nvl((hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id => v1.contract_id,
+                                                                    p_user_id     => 1)),
+                   '正常') approve_status,
+               v1.bp_id,
+               nvl((SELECT tc.trans_review_status
+                  FROM csh_transaction_contemp tc
+                 where tc.contemp_id =
+                       (select max(contemp_id)
+                          FROM csh_transaction_contemp tc
+                         where tc.source_contract_id = v1.contract_id
+                           and tc.batch_id is not null)),'NEW') trans_review_status,
+               nvl((SELECT sc.code_value_name
+                  FROM csh_transaction_contemp tc, sys_code_values_v sc
+                 where tc.contemp_id =
+                       (select max(contemp_id)
+                          FROM csh_transaction_contemp tc
+                         where tc.source_contract_id = v1.contract_id
+                           and tc.batch_id is not null)
+                   and sc.code = 'TRANS_REVIEW_STATUS'
+                   AND sc.code_value =nvl(tc.trans_review_status,'NEW')),'新建') trans_review_status_n
           from (select tt.ref_contract_id contract_id,
                        tt.deposit_trans_type,
                        sum((nvl(tt.transaction_amount, 0) -
-                   nvl(tt.write_off_amount, 0) - nvl(tt.returned_amount, 0))) unwrite_off_amount,
+                           nvl(tt.write_off_amount, 0) -
+                           nvl(tt.returned_amount, 0))) unwrite_off_amount,
                        tt.bp_id
                   from csh_transaction tt
                  where tt.transaction_type = 'DEPOSIT'
@@ -61,7 +84,7 @@
                    and tt.transaction_amount > 0
                    and tt.deposit_trans_type is not null
                  group by tt.ref_contract_id, tt.deposit_trans_type, tt.bp_id) v1
-          where v1.unwrite_off_amount>0)v
+         where v1.unwrite_off_amount > 0) v
                 #WHERE_CLAUSE#
                 ]]></bm:query-sql>
         </bm:operation>
@@ -74,6 +97,6 @@
         <bm:query-field name="bp_name_n" queryExpression="v.bp_name = ${@bp_name_n}"/>
         <bm:query-field name="bp_id_telnet_n" queryExpression="v.bp_id_telnet_n =${@bp_id_telnet_n}"/>
         <bm:query-field name="deposit_trans_type" queryExpression="v.deposit_trans_type =${@deposit_trans_type}"/>
-
+        <bm:query-field name="trans_review_status" queryExpression="v.trans_review_status =${@trans_review_status}"/>
     </bm:query-fields>
 </bm:model>
\ No newline at end of file

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/cus_deposit_transfer_maintain.lview

@@ -79,6 +79,7 @@
         ]]></script>
         <a:dataSets>
             <a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
+            <a:dataSet id="TRANS_REVIEW_STATUS_DS" lookupCode="TRANS_REVIEW_STATUS"/>
             <a:dataSet id="csh_deposit_transfer_maintain_query_ds" autoCreate="true">
                 <a:fields>
                     <a:field name="deposit_trans_type"/>
@@ -87,6 +88,8 @@
                     <a:field name="bp_id_telnet_n"/>
                     <a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS"
                              returnField="deposit_trans_type" displayField="code_value_name" valueField="code_value"/>
+                    <a:field name="trans_review_status_desc" options="TRANS_REVIEW_STATUS_DS"
+                             returnField="trans_review_status" displayField="code_value_name" valueField="code_value"/>
                 </a:fields>
             </a:dataSet>
             <a:dataSet id="deposit_transfer_maintain_result_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_query" queryDataSet="csh_deposit_transfer_maintain_query_ds" selectable="true" selectionModel="single">
@@ -105,6 +108,7 @@
                 <a:textField name="bp_name_n"  prompt="代理店" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
                 <a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
                 <a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
+                <a:comboBox name="trans_review_status_desc" prompt="复核状态" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
             </a:form>
             <a:fieldSet  labelWidth="150" style="margin-left:20px">
             <a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="deposit_transfer_maintain_result_ds" marginHeight="165" marginWidth="100" navBar="true" >
@@ -116,6 +120,7 @@
                         <a:column name="deposit_trans_type_n" prompt="保证金类型" width="110" align="center"/>
                         <a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110"  renderer="Leaf.formatMoney"  align="right" />
                         <a:column name="approve_status" prompt="状态" width="120" align="center"/>
+                        <a:column name="trans_review_status_n" prompt="复核状态" width="120" align="center"/>
                     </a:columns>
             </a:grid>
             </a:fieldSet>