|
@@ -31,7 +31,6 @@
|
|
|
<if test="params.structureId !=null and params.structureId !=''">
|
|
|
left join asso_structure_patent t on t.patent_no =a.patentno
|
|
|
</if>
|
|
|
-
|
|
|
<if test="params.applicationName !=null ">
|
|
|
left join os_applicant_attr b on a.id=b.pid and b.type =1
|
|
|
left join os_patent_applicant c on c.id=b.applicantid
|
|
@@ -51,7 +50,7 @@
|
|
|
</if>
|
|
|
<where>
|
|
|
<if test="params.productId !=null">
|
|
|
- and i.product_id =#{params.productId}
|
|
|
+ and i.product_Id = #{params.productId}
|
|
|
</if>
|
|
|
<if test="params.applicationName !=null and params.applicationName !='' ">
|
|
|
and c.name REGEXP #{params.applicationName}
|
|
@@ -115,6 +114,9 @@
|
|
|
a.agencyid as agency_id, a.num2 as right_num, a.quoteno as quote_num, a.quotedno as quoted_num,
|
|
|
a.patsnap_family as patSnapFamily, a.patsnapfamilynum as patSnapFamilyNum
|
|
|
from os_patent a
|
|
|
+ <if test="params.productId !=null and params.productId !=''">
|
|
|
+ left join asso_structure_patent t on t.patent_no =a.patentno
|
|
|
+ </if>
|
|
|
<if test="params.applicationName !=null ">
|
|
|
left join os_applicant_attr b on a.id=b.pid and b.type =1
|
|
|
left join os_patent_applicant c on c.id=b.applicantid
|
|
@@ -134,7 +136,7 @@
|
|
|
</if>
|
|
|
<where>
|
|
|
<if test="params.productId !=null">
|
|
|
- and a.patentno in (select patent_no from asso_structure_patent where product_Id = #{params.productId})
|
|
|
+ and t.product_Id = #{params.productId}
|
|
|
</if>
|
|
|
<if test="params.applicationName !=null and params.applicationName !='' ">
|
|
|
and c.name REGEXP #{params.applicationName}
|