|
@@ -677,7 +677,7 @@
|
|
|
#{locationProvince,jdbcType=INTEGER}
|
|
#{locationProvince,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="principal != null">
|
|
<if test="principal != null">
|
|
|
- group by p.id
|
|
|
|
|
|
|
+ group by p.id, o.id
|
|
|
</if>
|
|
</if>
|
|
|
ORDER BY p.serial_number DESC
|
|
ORDER BY p.serial_number DESC
|
|
|
<if test="page_sql!=null">
|
|
<if test="page_sql!=null">
|
|
@@ -687,7 +687,7 @@
|
|
|
|
|
|
|
|
<select id="findManagePatentCount" resultType="java.lang.Integer"
|
|
<select id="findManagePatentCount" resultType="java.lang.Integer"
|
|
|
parameterType="String">
|
|
parameterType="String">
|
|
|
- select count(1)
|
|
|
|
|
|
|
+ select count(distinct(p.id))
|
|
|
from patent_info p
|
|
from patent_info p
|
|
|
LEFT JOIN organization_identity o on
|
|
LEFT JOIN organization_identity o on
|
|
|
p.uid = o.uid
|
|
p.uid = o.uid
|
|
@@ -753,9 +753,6 @@
|
|
|
and
|
|
and
|
|
|
o.licence_province=#{locationProvince,jdbcType=INTEGER}
|
|
o.licence_province=#{locationProvince,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="principal != null">
|
|
|
|
|
- group by p.id
|
|
|
|
|
- </if>
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="findManagePendingPaymentListByPage" resultType="com.goafanti.patent.bo.PatentPendingBo"
|
|
<select id="findManagePendingPaymentListByPage" resultType="com.goafanti.patent.bo.PatentPendingBo"
|
|
@@ -783,7 +780,7 @@
|
|
|
#{locationProvince,jdbcType=INTEGER}
|
|
#{locationProvince,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="principal != null">
|
|
<if test="principal != null">
|
|
|
- group by p.id
|
|
|
|
|
|
|
+ group by p.id,o.id,c.id
|
|
|
</if>
|
|
</if>
|
|
|
ORDER BY p.serial_number DESC
|
|
ORDER BY p.serial_number DESC
|
|
|
<if test="page_sql!=null">
|
|
<if test="page_sql!=null">
|
|
@@ -793,7 +790,7 @@
|
|
|
|
|
|
|
|
<select id="findManagePendingPaymentCount" resultType="java.lang.Integer"
|
|
<select id="findManagePendingPaymentCount" resultType="java.lang.Integer"
|
|
|
parameterType="String">
|
|
parameterType="String">
|
|
|
- select count(1)
|
|
|
|
|
|
|
+ select count(distinct(p.id))
|
|
|
from patent_info p
|
|
from patent_info p
|
|
|
INNER JOIN patent_cost c on p.id = c.pid
|
|
INNER JOIN patent_cost c on p.id = c.pid
|
|
|
LEFT JOIN organization_identity o on p.uid = o.id
|
|
LEFT JOIN organization_identity o on p.uid = o.id
|
|
@@ -808,9 +805,6 @@
|
|
|
and o.licence_province =
|
|
and o.licence_province =
|
|
|
#{locationProvince,jdbcType=INTEGER}
|
|
#{locationProvince,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="principal != null">
|
|
|
|
|
- group by p.id
|
|
|
|
|
- </if>
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="findNoticeOfCorrectionListByPage" parameterType="String"
|
|
<select id="findNoticeOfCorrectionListByPage" parameterType="String"
|
|
@@ -876,7 +870,7 @@
|
|
|
o.licence_province=#{locationProvince,jdbcType=INTEGER}
|
|
o.licence_province=#{locationProvince,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="principal != null">
|
|
<if test="principal != null">
|
|
|
- group by p.id
|
|
|
|
|
|
|
+ group by p.id,o.id
|
|
|
</if>
|
|
</if>
|
|
|
order by p.serial_number DESC
|
|
order by p.serial_number DESC
|
|
|
<if test="page_sql!=null">
|
|
<if test="page_sql!=null">
|
|
@@ -886,7 +880,7 @@
|
|
|
|
|
|
|
|
<select id="findNoticeOfCorrectionCount" resultType="java.lang.Integer"
|
|
<select id="findNoticeOfCorrectionCount" resultType="java.lang.Integer"
|
|
|
parameterType="String">
|
|
parameterType="String">
|
|
|
- select count(1)
|
|
|
|
|
|
|
+ select count(distinct(p.id))
|
|
|
FROM patent_info p
|
|
FROM patent_info p
|
|
|
LEFT JOIN organization_identity o ON o.uid = p.uid
|
|
LEFT JOIN organization_identity o ON o.uid = p.uid
|
|
|
LEFT JOIN admin a on a.id = p.author
|
|
LEFT JOIN admin a on a.id = p.author
|