|
@@ -32,6 +32,7 @@
|
|
|
<result column="office" property="office" jdbcType="VARCHAR" />
|
|
<result column="office" property="office" jdbcType="VARCHAR" />
|
|
|
<result column="principal" property="principal" jdbcType="VARCHAR" />
|
|
<result column="principal" property="principal" jdbcType="VARCHAR" />
|
|
|
<result column="confirm_state" property="confirmState" jdbcType="INTEGER" />
|
|
<result column="confirm_state" property="confirmState" jdbcType="INTEGER" />
|
|
|
|
|
+ <result column="record_time" property="recordTime" jdbcType="TIMESTAMP" />
|
|
|
<result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
|
|
<result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
|
|
|
</resultMap>
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List" >
|
|
<sql id="Base_Column_List" >
|
|
@@ -40,7 +41,7 @@
|
|
|
patent_certificate_url, patent_application_date, first_inventor_name, first_inventor_nationality,
|
|
patent_certificate_url, patent_application_date, first_inventor_name, first_inventor_nationality,
|
|
|
first_inventor_id_number, first_inventor_is_publish, second_inventor_name, second_inventor_nationality,
|
|
first_inventor_id_number, first_inventor_is_publish, second_inventor_name, second_inventor_nationality,
|
|
|
second_inventor_is_publish, third_inventor_name, third_inventor_nationality, third_inventor_is_publish,
|
|
second_inventor_is_publish, third_inventor_name, third_inventor_nationality, third_inventor_is_publish,
|
|
|
- create_time, author, authorized_date,office, principal ,confirm_state, deleted_sign
|
|
|
|
|
|
|
+ create_time, author, authorized_date,office, principal ,confirm_state, record_time, deleted_sign
|
|
|
</sql>
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
|
|
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
|
|
|
select
|
|
select
|
|
@@ -64,7 +65,7 @@
|
|
|
second_inventor_nationality, second_inventor_is_publish,
|
|
second_inventor_nationality, second_inventor_is_publish,
|
|
|
third_inventor_name, third_inventor_nationality,
|
|
third_inventor_name, third_inventor_nationality,
|
|
|
third_inventor_is_publish, create_time, author, authorized_date,
|
|
third_inventor_is_publish, create_time, author, authorized_date,
|
|
|
- office, principal, confirm_state, deleted_sign)
|
|
|
|
|
|
|
+ office, principal, confirm_state, record_time, deleted_sign)
|
|
|
|
|
|
|
|
values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER},
|
|
values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER},
|
|
|
#{patentNumber,jdbcType=VARCHAR}, #{patentName,jdbcType=VARCHAR}, #{patentCatagory,jdbcType=INTEGER},
|
|
#{patentNumber,jdbcType=VARCHAR}, #{patentName,jdbcType=VARCHAR}, #{patentCatagory,jdbcType=INTEGER},
|
|
@@ -78,7 +79,8 @@
|
|
|
#{thirdInventorName,jdbcType=VARCHAR}, #{thirdInventorNationality,jdbcType=VARCHAR},
|
|
#{thirdInventorName,jdbcType=VARCHAR}, #{thirdInventorNationality,jdbcType=VARCHAR},
|
|
|
#{thirdInventorIsPublish,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{author,jdbcType=VARCHAR},
|
|
#{thirdInventorIsPublish,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{author,jdbcType=VARCHAR},
|
|
|
#{authorizedDate,jdbcType=TIMESTAMP},
|
|
#{authorizedDate,jdbcType=TIMESTAMP},
|
|
|
- #{office,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{confirmState,jdbcType=INTEGER}, #{deletedSign,jdbcType=INTEGER})
|
|
|
|
|
|
|
+ #{office,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{recordTime,jdbcType=TIMESTAMP},
|
|
|
|
|
+ #{confirmState,jdbcType=INTEGER}, #{deletedSign,jdbcType=INTEGER})
|
|
|
</insert>
|
|
</insert>
|
|
|
<insert id="insertSelective" parameterType="com.goafanti.common.model.PatentInfo" >
|
|
<insert id="insertSelective" parameterType="com.goafanti.common.model.PatentInfo" >
|
|
|
insert into patent_info
|
|
insert into patent_info
|
|
@@ -173,6 +175,9 @@
|
|
|
<if test="confirmState != null">
|
|
<if test="confirmState != null">
|
|
|
confirm_state,
|
|
confirm_state,
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="recordTime != null">
|
|
|
|
|
+ record_time,
|
|
|
|
|
+ </if>
|
|
|
<if test="deletedSign != null">
|
|
<if test="deletedSign != null">
|
|
|
deleted_sign,
|
|
deleted_sign,
|
|
|
</if>
|
|
</if>
|
|
@@ -266,10 +271,13 @@
|
|
|
#{principal,jdbcType=VARCHAR},
|
|
#{principal,jdbcType=VARCHAR},
|
|
|
</if>
|
|
</if>
|
|
|
<if test="confirmState != null">
|
|
<if test="confirmState != null">
|
|
|
- #{confirmState,jdbcType=INTEGER}
|
|
|
|
|
|
|
+ #{confirmState,jdbcType=INTEGER},
|
|
|
|
|
+ </if>
|
|
|
|
|
+ <if test="recordTime != null" >
|
|
|
|
|
+ #{recordTime,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
</if>
|
|
|
<if test="deletedSign != null">
|
|
<if test="deletedSign != null">
|
|
|
- #{deletedSign,jdbcType=INTEGER}
|
|
|
|
|
|
|
+ #{deletedSign,jdbcType=INTEGER},
|
|
|
</if>
|
|
</if>
|
|
|
</trim>
|
|
</trim>
|
|
|
</insert>
|
|
</insert>
|
|
@@ -352,7 +360,7 @@
|
|
|
author = #{author,jdbcType=VARCHAR},
|
|
author = #{author,jdbcType=VARCHAR},
|
|
|
</if>
|
|
</if>
|
|
|
<if test="authorizedDate != null" >
|
|
<if test="authorizedDate != null" >
|
|
|
- authorized_date = #{authorizedDate,jdbcType=VARCHAR},
|
|
|
|
|
|
|
+ authorized_date = #{authorizedDate,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
</if>
|
|
|
<if test="office != null" >
|
|
<if test="office != null" >
|
|
|
office = #{office,jdbcType=VARCHAR},
|
|
office = #{office,jdbcType=VARCHAR},
|
|
@@ -363,6 +371,9 @@
|
|
|
<if test="confirmState != null">
|
|
<if test="confirmState != null">
|
|
|
confirm_state = #{confirmState,jdbcType=INTEGER},
|
|
confirm_state = #{confirmState,jdbcType=INTEGER},
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="recordTime != null" >
|
|
|
|
|
+ record_time = #{recordTime,jdbcType=TIMESTAMP},
|
|
|
|
|
+ </if>
|
|
|
<if test="deletedSign != null">
|
|
<if test="deletedSign != null">
|
|
|
deleted_sign = #{deletedSign,jdbcType=INTEGER},
|
|
deleted_sign = #{deletedSign,jdbcType=INTEGER},
|
|
|
</if>
|
|
</if>
|
|
@@ -396,10 +407,11 @@
|
|
|
third_inventor_is_publish = #{thirdInventorIsPublish,jdbcType=INTEGER},
|
|
third_inventor_is_publish = #{thirdInventorIsPublish,jdbcType=INTEGER},
|
|
|
create_time = #{createTime,jdbcType=TIMESTAMP},
|
|
create_time = #{createTime,jdbcType=TIMESTAMP},
|
|
|
author = #{author,jdbcType=VARCHAR},
|
|
author = #{author,jdbcType=VARCHAR},
|
|
|
- authorized_date = #{authorizedDate,jdbcType=VARCHAR},
|
|
|
|
|
|
|
+ authorized_date = #{authorizedDate,jdbcType=TIMESTAMP},
|
|
|
office = #{office,jdbcType=VARCHAR},
|
|
office = #{office,jdbcType=VARCHAR},
|
|
|
principal = #{principal,jdbcType=VARCHAR},
|
|
principal = #{principal,jdbcType=VARCHAR},
|
|
|
confirm_state = #{confirmState,jdbcType=INTEGER},
|
|
confirm_state = #{confirmState,jdbcType=INTEGER},
|
|
|
|
|
+ record_time = #{recordTime,jdbcType=TIMESTAMP},
|
|
|
deleted_sign = #{deletedSign,jdbcType=INTEGER}
|
|
deleted_sign = #{deletedSign,jdbcType=INTEGER}
|
|
|
where id = #{id,jdbcType=VARCHAR}
|
|
where id = #{id,jdbcType=VARCHAR}
|
|
|
</update>
|
|
</update>
|
|
@@ -431,7 +443,7 @@
|
|
|
<if test = "patentState != nulll">
|
|
<if test = "patentState != nulll">
|
|
|
and patent_state = #{patentState,jdbcType=INTEGER}
|
|
and patent_state = #{patentState,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
- order by patent_application_date desc
|
|
|
|
|
|
|
+ order by record_time desc
|
|
|
<if test="page_sql!=null">
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
${page_sql}
|
|
|
</if>
|
|
</if>
|
|
@@ -457,7 +469,6 @@
|
|
|
<if test = "patentState != nulll">
|
|
<if test = "patentState != nulll">
|
|
|
and patent_state = #{patentState,jdbcType=INTEGER}
|
|
and patent_state = #{patentState,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
- order by patent_application_date desc
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="findManagePatentListByPage" resultType="com.goafanti.techservice.patent.bo.PatentCompositeBo" parameterType="String">
|
|
<select id="findManagePatentListByPage" resultType="com.goafanti.techservice.patent.bo.PatentCompositeBo" parameterType="String">
|
|
@@ -490,7 +501,8 @@
|
|
|
p.second_inventor_nationality as secondInventorNationality , p.third_inventor_name as thirdInventorName,
|
|
p.second_inventor_nationality as secondInventorNationality , p.third_inventor_name as thirdInventorName,
|
|
|
p.third_inventor_nationality as thirdInventorNationality , p.patent_prory_statement_url as patentProryStatementUrl ,
|
|
p.third_inventor_nationality as thirdInventorNationality , p.patent_prory_statement_url as patentProryStatementUrl ,
|
|
|
o.last_year_tax_report_url as lastYearTaxReportUrl, p.patent_writing_url as patentWritingUrl ,
|
|
o.last_year_tax_report_url as lastYearTaxReportUrl, p.patent_writing_url as patentWritingUrl ,
|
|
|
- p.authorization_notice_url as authorizationNoticeUrl , p.patent_certificate_url as patentCertificateUrl
|
|
|
|
|
|
|
+ p.authorization_notice_url as authorizationNoticeUrl ,
|
|
|
|
|
+ p.patent_certificate_url as patentCertificateUrl, p.record_time as recordTime
|
|
|
from user u
|
|
from user u
|
|
|
LEFT JOIN organization_identity o
|
|
LEFT JOIN organization_identity o
|
|
|
on u.id = o.uid
|
|
on u.id = o.uid
|
|
@@ -541,8 +553,8 @@
|
|
|
<if test="locationProvince != null">
|
|
<if test="locationProvince != null">
|
|
|
and o.location_province = #{locationProvince,jdbcType=VARCHAR}
|
|
and o.location_province = #{locationProvince,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
- order by p.create_time desc) x
|
|
|
|
|
- LEFT JOIN admin a on a.id = x.author
|
|
|
|
|
|
|
+ ) x
|
|
|
|
|
+ LEFT JOIN admin a on a.id = x.author order by x.recordTime desc
|
|
|
<if test="page_sql!=null">
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
${page_sql}
|
|
|
</if>
|
|
</if>
|
|
@@ -550,45 +562,14 @@
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="findManagePatentCount" resultType="java.lang.Integer" parameterType="String">
|
|
<select id="findManagePatentCount" resultType="java.lang.Integer" parameterType="String">
|
|
|
- select count(1) from (
|
|
|
|
|
-
|
|
|
|
|
- select a.name as author,x.uid ,
|
|
|
|
|
- x.oid ,x.pid ,
|
|
|
|
|
- x.serialNumber,x.patentNumber,
|
|
|
|
|
- x.office , x.unitName ,
|
|
|
|
|
- x.patentCatagory , x.patentName ,
|
|
|
|
|
- x.patentState , x.createTime ,
|
|
|
|
|
- x.patentApplicationDate,x.authorizedDate ,
|
|
|
|
|
- x.orgCode , x.locationProvince ,
|
|
|
|
|
- x.locationCity , x.locationArea ,
|
|
|
|
|
- x.contacts , x.patentField ,
|
|
|
|
|
- x.patentDes ,x.firstInventorName,
|
|
|
|
|
- x.firstInventorNationality , x.firstInventorIdNumber ,
|
|
|
|
|
- x.secondInventorName, x.secondInventorNationality ,
|
|
|
|
|
- x.thirdInventorName , x.thirdInventorNationality ,
|
|
|
|
|
- x.patentProryStatementUrl, x.lastYearTaxReportUrl ,
|
|
|
|
|
- x.patentWritingUrl, x.authorizationNoticeUrl,
|
|
|
|
|
- x.patentCertificateUrl from
|
|
|
|
|
- (select u.id as uid ,o.id as oid , p.id as pid , p.serial_number as serialNumber , p.patent_number as patentNumber , p.office ,
|
|
|
|
|
- o.unit_name as unitName,
|
|
|
|
|
- p.patent_catagory as patentCatagory,p.patent_name as patentName,p.patent_state as patentState,p.create_time as createTime,
|
|
|
|
|
- p.patent_application_date as patentApplicationDate,
|
|
|
|
|
- p.authorized_date as authorizedDate, p.author, o.org_code as orgCode, o.location_province as locationProvince,
|
|
|
|
|
- o.location_city as locationCity, o.location_area as locationArea,
|
|
|
|
|
- o.contacts, u.number, p.patent_field as patentField, p.patent_des as patentDes , p.first_inventor_name as firstInventorName,
|
|
|
|
|
- p.first_inventor_nationality as firstInventorNationality,
|
|
|
|
|
- p.first_inventor_id_number as firstInventorIdNumber, p.second_inventor_name as secondInventorName ,
|
|
|
|
|
- p.second_inventor_nationality as secondInventorNationality , p.third_inventor_name as thirdInventorName,
|
|
|
|
|
- p.third_inventor_nationality as thirdInventorNationality , p.patent_prory_statement_url as patentProryStatementUrl ,
|
|
|
|
|
- o.last_year_tax_report_url as lastYearTaxReportUrl, p.patent_writing_url as patentWritingUrl ,
|
|
|
|
|
- p.authorization_notice_url as authorizationNoticeUrl , p.patent_certificate_url as patentCertificateUrl
|
|
|
|
|
|
|
+ select count(1) from
|
|
|
|
|
+ (select p.author
|
|
|
from user u
|
|
from user u
|
|
|
LEFT JOIN organization_identity o
|
|
LEFT JOIN organization_identity o
|
|
|
on u.id = o.uid
|
|
on u.id = o.uid
|
|
|
INNER JOIN patent_info p
|
|
INNER JOIN patent_info p
|
|
|
on u.id = p.uid
|
|
on u.id = p.uid
|
|
|
- where deleted_sign = 0
|
|
|
|
|
-
|
|
|
|
|
|
|
+ where p.deleted_sign = 0
|
|
|
<if test="serialNumber != null">
|
|
<if test="serialNumber != null">
|
|
|
and p.serial_number = #{serialNumber,jdbcType=INTEGER}
|
|
and p.serial_number = #{serialNumber,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
@@ -632,10 +613,9 @@
|
|
|
<if test="locationProvince != null">
|
|
<if test="locationProvince != null">
|
|
|
and o.location_province=#{locationProvince,jdbcType=VARCHAR}
|
|
and o.location_province=#{locationProvince,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
- order by p.create_time desc) x
|
|
|
|
|
|
|
+ ) x
|
|
|
LEFT JOIN admin a on a.id = x.author
|
|
LEFT JOIN admin a on a.id = x.author
|
|
|
- )
|
|
|
|
|
- as total
|
|
|
|
|
|
|
+
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="findManagePendingPaymentListByPage" resultType="com.goafanti.techservice.patent.bo.PatentPendingBo" parameterType="String">
|
|
<select id="findManagePendingPaymentListByPage" resultType="com.goafanti.techservice.patent.bo.PatentPendingBo" parameterType="String">
|
|
@@ -643,39 +623,34 @@
|
|
|
from patent_cost c INNER JOIN
|
|
from patent_cost c INNER JOIN
|
|
|
(select u.id as uid , p.id as pid ,o.id as oid , p.serial_number as serialNumber ,p.patent_number as patentNumber ,
|
|
(select u.id as uid , p.id as pid ,o.id as oid , p.serial_number as serialNumber ,p.patent_number as patentNumber ,
|
|
|
o.location_province as locationProvince , o.unit_name as unitName , p.patent_name as patentName,
|
|
o.location_province as locationProvince , o.unit_name as unitName , p.patent_name as patentName,
|
|
|
- p.patent_catagory as patentCatagory ,p.patent_state as patentState , p.authorized_date as authorizedDate
|
|
|
|
|
|
|
+ p.patent_catagory as patentCatagory ,p.patent_state as patentState , p.authorized_date as authorizedDate,
|
|
|
|
|
+ p.record_time as recordTime
|
|
|
from user u
|
|
from user u
|
|
|
LEFT JOIN organization_identity o on o.uid = u.id
|
|
LEFT JOIN organization_identity o on o.uid = u.id
|
|
|
INNER JOIN patent_info p on u.id =p.uid where p.deleted_sign = 0
|
|
INNER JOIN patent_info p on u.id =p.uid where p.deleted_sign = 0
|
|
|
<if test="locationProvince != null">
|
|
<if test="locationProvince != null">
|
|
|
and o.location_province = #{locationProvince,jdbcType=VARCHAR}
|
|
and o.location_province = #{locationProvince,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
- order by p.authorized_date DESC
|
|
|
|
|
) n
|
|
) n
|
|
|
on n.pid= c.pid where c.annual_fee_state=0
|
|
on n.pid= c.pid where c.annual_fee_state=0
|
|
|
-
|
|
|
|
|
|
|
+ order by n.recordTime DESC
|
|
|
<if test="page_sql!=null">
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
${page_sql}
|
|
|
</if>
|
|
</if>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="findManagePendingPaymentCount" resultType="java.lang.Integer" parameterType="String">
|
|
<select id="findManagePendingPaymentCount" resultType="java.lang.Integer" parameterType="String">
|
|
|
- select count(1) from (
|
|
|
|
|
- select n.*,c.id as cid ,c.annual_fee_state as annualFeeState
|
|
|
|
|
- from patent_cost c INNER JOIN
|
|
|
|
|
- (select u.id as uid , p.id as pid ,o.id as oid , p.serial_number as serialNumber ,p.patent_number as patentNumber ,
|
|
|
|
|
- o.location_province as locationProvince , o.unit_name as unitName , p.patent_name as patentName,
|
|
|
|
|
- p.patent_catagory as patentCatagory ,p.patent_state as patentState , p.authorized_date as authorizedDate
|
|
|
|
|
|
|
+ select count(1) from
|
|
|
|
|
+ patent_cost c INNER JOIN
|
|
|
|
|
+ (select p.id as pid
|
|
|
from user u
|
|
from user u
|
|
|
LEFT JOIN organization_identity o on o.uid = u.id
|
|
LEFT JOIN organization_identity o on o.uid = u.id
|
|
|
INNER JOIN patent_info p on u.id = p.uid where p.deleted_sign = 0
|
|
INNER JOIN patent_info p on u.id = p.uid where p.deleted_sign = 0
|
|
|
<if test="locationProvince != null">
|
|
<if test="locationProvince != null">
|
|
|
and o.location_province = #{locationProvince,jdbcType=VARCHAR}
|
|
and o.location_province = #{locationProvince,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
- order by p.authorized_date DESC
|
|
|
|
|
) n
|
|
) n
|
|
|
on n.pid= c.pid where c.annual_fee_state=0
|
|
on n.pid= c.pid where c.annual_fee_state=0
|
|
|
- ) as total
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="findNoticeOfCorrectionListByPage" parameterType="String" resultType="com.goafanti.techservice.patent.bo.PatentNoticeOfCorrectionBo">
|
|
<select id="findNoticeOfCorrectionListByPage" parameterType="String" resultType="com.goafanti.techservice.patent.bo.PatentNoticeOfCorrectionBo">
|
|
@@ -717,23 +692,17 @@
|
|
|
<if test="locationProvince != null">
|
|
<if test="locationProvince != null">
|
|
|
and o.location_province=#{locationProvince,jdbcType=VARCHAR}
|
|
and o.location_province=#{locationProvince,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
- order by p.authorized_date DESC
|
|
|
|
|
|
|
+ order by p.record_time DESC
|
|
|
<if test="page_sql!=null">
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
${page_sql}
|
|
|
</if>
|
|
</if>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="findNoticeOfCorrectionCount" resultType="java.lang.Integer" parameterType="String">
|
|
<select id="findNoticeOfCorrectionCount" resultType="java.lang.Integer" parameterType="String">
|
|
|
- select count(1) from (
|
|
|
|
|
-
|
|
|
|
|
- select u.id as uid ,p.id as pid , o.id as oid , p.serial_number as serialNumber , p.patent_number as patentNumber ,
|
|
|
|
|
- p.patent_name as patentName , p.office ,
|
|
|
|
|
- o.location_province as locationProvince ,o.unit_name as unitName , p.patent_catagory as patentCatagory ,
|
|
|
|
|
- p.patent_state as patentState , p.author , p.authorized_date as authorizedDate
|
|
|
|
|
- FROM user u
|
|
|
|
|
|
|
+ select count(1) from user u
|
|
|
LEFT JOIN organization_identity o ON u.id = o.uid
|
|
LEFT JOIN organization_identity o ON u.id = o.uid
|
|
|
INNER JOIN patent_info p on u.id = p.uid
|
|
INNER JOIN patent_info p on u.id = p.uid
|
|
|
- where p.patent_state in (4,6) and p.delete_sign = 0
|
|
|
|
|
|
|
+ where p.patent_state in (4,6) and p.deleted_sign = 0
|
|
|
<if test="serialNumber != null">
|
|
<if test="serialNumber != null">
|
|
|
and p.serial_number = #{serialNumber,jdbcType=INTEGER}
|
|
and p.serial_number = #{serialNumber,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
@@ -764,9 +733,6 @@
|
|
|
<if test="locationProvince != null">
|
|
<if test="locationProvince != null">
|
|
|
and o.location_province=#{locationProvince,jdbcType=VARCHAR}
|
|
and o.location_province=#{locationProvince,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
- order by p.authorized_date DESC
|
|
|
|
|
-
|
|
|
|
|
- ) as n
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
|
|
<update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
|