Merge remote-tracking branch 'origin/feature/建机电子合同开发' into feature/建机电子合同开发

src/main/webapp/WEB-INF/classes/wx/WX100/con_contract_query.lwm

@@ -73,16 +73,21 @@ select *
                    and cs.id_type = ${@id_type}
                    and rownum = 1) userSignStatus
           from con_contract t1, con_contract_change_req cr
-         where t1.data_class = 'NORMAL'
-           and t1.contract_id = cr.contract_id
+         where t1.contract_id = cr.contract_id
            and cr.ec_sign_type in ('INITIATE', 'SIGNING')
-           and t1.sign_type = 'ELE_SIGN'
+           and cr.sign_type = 'ELE_SIGN'
            and ((${@account_type} = 'PE' and exists (select 1 from con_contract_bp ccb ,hls_bp_master hb
                        where ccb.bp_id = hb.bp_id
                        and ccb.contract_id = t1.contract_id
                        and ccb.bp_category in ('TENANT','GUARANTOR') and (ccb.id_card_no = ${@id_no} or ccb.id_no_sp = ${@id_no})))
                        or (${@account_type} = 'AG' and exists (select 1 from hls_bp_master_signer hs where hs.hls_bp_signer_id = t1.signer and hs.id_card = ${@id_no}))
                        or (${@account_type} = 'AG' and exists (select 1 from con_contract_bp cb where cb.contract_id = t1.contract_id and cb.bp_category = 'GUARANTOR' and cb.bp_class = 'ORG' and cb.id_card_no_leg = ${@id_no}))
+                       or (${@account_type} = 'LP' and exists
+                        (select 1
+                            from con_contract_bp cb, hls_bp_master hb
+                           where cb.bp_id = hb.bp_id
+                             and cb.contract_id = t1.contract_id
+                             and hb.social_code = ${@id_no}))
                        )
         UNION ALL
         select t1.contract_id,
@@ -163,6 +168,12 @@ select *
                        and ccb.bp_category in ('TENANT','GUARANTOR') and (ccb.id_card_no = ${@id_no} or ccb.id_no_sp = ${@id_no})))
                        or (${@account_type} = 'AG' and exists (select 1 from hls_bp_master_signer hs where hs.hls_bp_signer_id = t1.signer and hs.id_card = ${@id_no}))
                        or (${@account_type} = 'AG' and exists (select 1 from con_contract_bp cb where cb.contract_id = t1.contract_id and cb.bp_category = 'GUARANTOR' and cb.bp_class = 'ORG' and cb.id_card_no_leg = ${@id_no}))
+                       or (${@account_type} = 'LP' and exists
+                        (select 1
+                            from con_contract_bp cb, hls_bp_master hb
+                           where cb.bp_id = hb.bp_id
+                             and cb.contract_id = t1.contract_id
+                             and hb.social_code = ${@id_no}))
                        )
                    ) v
                 #WHERE_CLAUSE#

src/main/webapp/WEB-INF/classes/wx/WX100/con_ele_savelogs.lwm

@@ -2,7 +2,7 @@
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:fields>
         <bm:field name="contract_id" databaseType="Number" datatype="java.lang.Double"/>
-        <bm:field name="httpurl" databaseType="CLOB" datatype="java.sql.Clob"/>
+        <bm:field name="httpurl" databaseType="VARCHAR2" datatype="java.lang.String"/>
         <bm:field name="jsonPut" databaseType="CLOB" datatype="java.sql.Clob"/>
         <bm:field name="jsonResult" databaseType="CLOB" datatype="java.sql.Clob"/>
         <bm:field name="tokenResult" databaseType="CLOB" datatype="java.sql.Clob"/>

src/main/webapp/WEB-INF/classes/wx/WX100/con_file_download.lwm

@@ -61,6 +61,7 @@ select fa.file_name,fa.file_path,fa.attachment_id
                            from con_contract cc
                           where cc.contract_id = ${@contract_id}
                             and cc.data_class = 'NORMAL')
+                    order by pi.order_seq
             ]]></bm:query-sql>
         </bm:operation>
     </bm:operations>