Merge remote-tracking branch 'origin/remote_dev' into remote_dev

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: LR
+    $Date: 2013-7-16 下午06:07:55
+    $Revision: 1.0
+    $Purpose:
+-->
+
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+            begin
+              for cur in(select cc.contract_id from
+                       con_contract cc
+                       where cc.contract_id in (${:@contract_ids}) ) loop
+                con_rent_dun_msg_pkg.rent_dun_sms_create(p_user_id     => ${/session/@user_id},
+                                                         p_contract_id => cur.contract_id,
+                                                         p_msg_type    => ${@msg_type});
+              end loop;
+            end;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

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

@@ -236,7 +236,15 @@
                                                 And gwo.times = ccc.times
                                                 And gwo.cf_item = ccc.cf_item),
                                          0)) As account_due_days -- 会计逾期天数*/
-
+                        ,(select to_char(max(t.creation_date), 'yyyy-mm-dd')
+                                  from cux_rent_dun_msg t
+                                 where t.contract_id = cc.contract_id) dun_date,
+                        cc.send_message,
+                        (select v.code_value_name
+                          From sys_code_values_v v
+                         Where v.code = 'SEND_MESSAGE'
+                          And cc.send_message = v.code_value ) send_message_n,
+                         cc.cell_phone
                       FROM con_contract cc
                       WHERE
                           EXISTS(SELECT 1
@@ -325,6 +333,7 @@
         <bm:query-field name="owner_user_id" queryExpression="t1.owner_user_id = ${@owner_user_id}"/>
         <bm:query-field name="lease_organization" queryExpression="t1.lease_organization = ${@lease_organization}"/>
         <bm:query-field name="business_type_n" queryExpression="t1.business_type = ${@business_type}"/>
+        <bm:query-field name="send_message" queryExpression="t1.send_message = ${@send_message}"/>
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="contract_status" enforceOperations="query"

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

@@ -148,7 +148,15 @@
                           cc.contract_status,
                           cc.BUSINESS_TYPE,
                           cc.repurchase_types
-
+                           ,(select to_char(max(t.creation_date), 'yyyy-mm-dd')
+                                  from cux_rent_dun_msg t
+                                 where t.contract_id = cc.contract_id) dun_date,
+                          cc.send_message,
+                         (select v.code_value_name
+                          From sys_code_values_v v
+                         Where v.code = 'SEND_MESSAGE'
+                          And cc.send_message = v.code_value ) send_message_n,
+                           cc.cell_phone
                       FROM con_contract cc
                       WHERE
                           cc.contract_status='REPURING'
@@ -239,6 +247,7 @@
         <bm:query-field name="owner_user_id" queryExpression="t1.owner_user_id = ${@owner_user_id}"/>
         <bm:query-field name="lease_organization" queryExpression="t1.lease_organization = ${@lease_organization}"/>
         <bm:query-field name="business_type_n" queryExpression="t1.business_type = ${@business_type}"/>
+        <bm:query-field name="send_message" queryExpression="t1.send_message = ${@send_message}"/>
     </bm:query-fields>
     <bm:data-filters>
  <bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>

src/main/webapp/modules/sys/SYS402/sys_sms_query.lview

@@ -5,8 +5,9 @@
 	$purpose:短信发送
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application">
-    <a:init-procedure><![CDATA[
-    ]]></a:init-procedure>
+    <a:init-procedure>
+        <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
+    </a:init-procedure>
     <a:view>
         <a:link id="pageLink_view_log" url="${/request/@context_path}/modules/sys/SYS402/sys_sms_log.lview"/>
         <!--<a:link id="bmLink_re_submit_sms" model="sys.SYS401.sys_sms_list" modelaction="update"/>-->
@@ -82,6 +83,15 @@
         	function smsQueryPage_reset(){
             $('sys402_query_ds').reset();
             }
+
+        //债权担当，隐藏重发列
+        Leaf.onReady(function () {
+            var role_code = "${/model/role_info/record/@role_code}";
+            if (role_code =='0008') {
+                var grid=$('smsQueryDs_grid');
+                grid.hideColumn('re_submit');
+            }
+        });
 		]]></script>
         <a:dataSets>
             <a:dataSet id="sys402_query_ds" autoCreate="true">