[建机]电子合同开发 买卖合同生成调整

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

@@ -85,12 +85,15 @@ select *
            and t1.ec_sign_type in ('INITIATE', 'SIGNING')
            and t1.sign_type = 'ELE_SIGN'
            and exists (select 1 from con_contract_ele_flow cf where cf.contract_id = t1.contract_id)
+           and exists (select 1 from con_contract_ele_signer csr where csr.contract_id = t1.contract_id and csr.sign_url is not null and csr.id_no = ${@id_no})
            and ((${@account_type} = 'PE' and exists
                 (select 1
                     from con_contract_bp ccb, con_contract_ele_signer cs
                    where ccb.bp_id = cs.bp_id
                      and ccb.contract_id = t1.contract_id
-                     and ccb.bp_category in ('TENANT', 'GUARANTOR')
+                     and cs.esign_type = decode(t1.data_class,'NORMAL','CE','CHANGE_REQ','ET')
+                     and ((ccb.bp_category in ('TENANT', 'GUARANTOR') and t1.data_class = 'NORMAL')
+                         or ccb.bp_category = 'TENANT' and t1.data_class = 'CHANGE_REQ')
                      and (ccb.id_card_no = ${@id_no} or
                          (ccb.id_no_sp = ${@id_no} and ccb.sp_sign_flag = 'Y')))) or
                (${@account_type} = 'AG' and exists