[建机]电子合同开发 电子签约查询修改

src/main/webapp/WEB-INF/classes/cont/CON500/con_contract_content_v.lwm

@@ -194,6 +194,6 @@
         </bm:operation>
     </bm:operations>
     <bm:data-filters>
-        <bm:data-filter enforceOperations="query" expression="t.contract_id=${@contract_id}"/>
+        <bm:data-filter enforceOperations="query" expression="t.contract_id=${@contract_id} and exists (select 1 from con_clause_templet ct where ct.templet_id = t.templet_id and ct.ele_content_flag != 'Y')"/>
     </bm:data-filters>
 </bm:model>

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

@@ -63,8 +63,13 @@ select *
               (SELECT cs.sign_url
                    from con_contract_ele_signer cs
                   where cs.contract_id = t1.contract_id
-                   and cs.id_no = ${@id_no}
-                   and cs.id_type = ${@id_type}
+                    and ((${@account_type} = 'AG' and
+                        cs.id_no =
+                        (select hm.social_code
+                             from hls_bp_master hm
+                            where t1.bp_id_tenant = hm.bp_id)) or
+                        (${@account_type} != 'AG' and
+                        cs.id_no = ${@id_no}))
                     and rownum = 1) sign_url,
                (SELECT nvl(cs.ec_sign_status, 'N')
                   from con_contract_ele_signer cs
@@ -149,8 +154,13 @@ select *
               (SELECT cs.sign_url
                    from con_contract_ele_signer cs
                   where cs.contract_id = t1.contract_id
-                   and cs.id_no = ${@id_no}
-                   and cs.id_type = ${@id_type}
+                    and ((${@account_type} = 'AG' and
+                        cs.id_no =
+                        (select hm.social_code
+                             from hls_bp_master hm
+                            where t1.bp_id_tenant = hm.bp_id)) or
+                        (${@account_type} != 'AG' and
+                        cs.id_no = ${@id_no}))
                     and rownum = 1) sign_url,
                (SELECT nvl(cs.ec_sign_status, 'N')
                   from con_contract_ele_signer cs

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

@@ -16,6 +16,8 @@
         <bm:field name="mobile"/>
         <bm:field name="signer_category"/>
         <bm:field name="esign_type"/>
+        <bm:field name="legal_person"/>
+        <bm:field name="id_card_no_leg"/>
     </bm:fields>
     <bm:operations>
         <bm:operation name="query">
@@ -29,7 +31,19 @@
                    cs.id_no,
                    cs.mobile,
                    hs.signer_category,
-                   cs.esign_type
+                   cs.esign_type,
+                   (select hm.legal_person
+                    from con_contract_bp cb, hls_bp_master hm
+                   where cb.bp_id = hm.bp_id
+                     and cb.contract_id = cs.contract_id
+                     and cb.bp_category = 'TENANT'
+                     and cb.bp_class = 'ORG') legal_person,
+                   (select hm.id_card_no_leg
+                    from con_contract_bp cb, hls_bp_master hm
+                   where cb.bp_id = hm.bp_id
+                     and cb.contract_id = cs.contract_id
+                     and cb.bp_category = 'TENANT'
+                     and cb.bp_class = 'ORG') id_card_no_leg
               from con_contract_ele_signer cs, hls_doc_file_templet_signer hs
              where cs.templet_signer_id = hs.templet_signer_id) t
                 #WHERE_CLAUSE#

src/main/webapp/modules/wx/WX100/con_ele_content_create.lsc

@@ -181,19 +181,36 @@
                         signer_category:'TENANT_ORG_SIGN'
                     });
                     var ele_org_signer_data = ele_org_signer_map.getChildren();
+                    //经办人
                     var agentName = ele_org_signer_data[0].bp_name;
                     var agentIdNo = ele_org_signer_data[0].id_no;
                     var mobile = ele_org_signer_data[0].mobile;
+                    //法人
+                    var legalName = ele_org_signer_data[0].legal_person;
+                    var legalIdNo = ele_org_signer_data[0].id_card_no_leg;
+                    if (agentIdNo == legalIdNo){
                         userInfoList.push({
                             "idNo":signer_record_data.id_no,
                             "name":signer_record_data.bp_name,
                             "agentIdNo":agentIdNo,
                             "agentName":agentName,
                             "mobile":mobile,
-                        "legalName":agentName,
-                        "legalIdNo":agentIdNo,
+                            "legalName":legalName,
+                            "legalIdNo":legalIdNo,
+                            "agentType":"1"
+                        });
+                    }else{
+                        userInfoList.push({
+                            "idNo":signer_record_data.id_no,
+                            "name":signer_record_data.bp_name,
+                            "agentIdNo":agentIdNo,
+                            "agentName":agentName,
+                            "mobile":mobile,
+                            "legalName":legalName,
+                            "legalIdNo":legalIdNo,
                             "agentType":"2"
                         });
+                    }
                 }else if(signer_record_data.signer_category == 'GUARANTOR_ORG_SEAL'){
                     var ele_org_signer_map = ele_signer_bm.queryAsMap({
                         contract_id: $ctx.parameter.contract_id,

src/main/webapp/modules/wx/WX100/con_ele_terminate_create.lsc

@@ -183,21 +183,38 @@
                         signer_category:'TENANT_ORG_SIGN'
                     });
                     var ele_org_signer_data = ele_org_signer_map.getChildren();
+                    //经办人
                     var agentName = ele_org_signer_data[0].bp_name;
                     var agentIdNo = ele_org_signer_data[0].id_no;
                     var mobile = ele_org_signer_data[0].mobile;
+                    //法人
+                    var legalName = ele_org_signer_data[0].legal_person;
+                    var legalIdNo = ele_org_signer_data[0].id_card_no_leg;
+                    if (agentIdNo == legalIdNo){
                         userInfoList.push({
                             "idNo":signer_record_data.id_no,
                             "name":signer_record_data.bp_name,
                             "agentIdNo":agentIdNo,
                             "agentName":agentName,
                             "mobile":mobile,
-                        "legalName":agentName,
-                        "legalIdNo":agentIdNo,
+                            "legalName":legalName,
+                            "legalIdNo":legalIdNo,
+                            "agentType":"1"
+                        });
+                    }else{
+                        userInfoList.push({
+                            "idNo":signer_record_data.id_no,
+                            "name":signer_record_data.bp_name,
+                            "agentIdNo":agentIdNo,
+                            "agentName":agentName,
+                            "mobile":mobile,
+                            "legalName":legalName,
+                            "legalIdNo":legalIdNo,
                             "agentType":"2"
                         });
                     }
                 }
+            }
             var ele_contract_signer_map = ele_contract_signer_bm.queryAsMap({
                 contract_id: $ctx.parameter.contract_id
             });