|
@@ -422,25 +422,27 @@
|
|
|
select a.id,a.patent_no as patentNo,a.name,a.type,a.status,a.holders,a.inventor,
|
|
select a.id,a.patent_no as patentNo,a.name,a.type,a.status,a.holders,a.inventor,
|
|
|
a.annual_fee_status annualFeeStatus,date_format(a.apply_date,'%Y-%m-%d') applyDates,
|
|
a.annual_fee_status annualFeeStatus,date_format(a.apply_date,'%Y-%m-%d') applyDates,
|
|
|
a.uid,a.salesman_remind salesmanRemind,a.email,a.province,a.years ,a.certificate_url as certificateUrl,
|
|
a.uid,a.salesman_remind salesmanRemind,a.email,a.province,a.years ,a.certificate_url as certificateUrl,
|
|
|
- date_format(a.authorization_date ,'%Y-%m-%d ')authorizationDates,
|
|
|
|
|
|
|
+ date_format(a.authorization_date ,'%Y-%m-%d ')authorizationDates,a.aid ,
|
|
|
a.applicant,a.contact_mobile as contactMobile,date_format(a.end_date,'%Y-%m-%d') as endDates,
|
|
a.applicant,a.contact_mobile as contactMobile,date_format(a.end_date,'%Y-%m-%d') as endDates,
|
|
|
date_format(a.create_time,'%Y-%m-%d %H:%I:%S') as createTimeS,a.apply_date as applyDate,
|
|
date_format(a.create_time,'%Y-%m-%d %H:%I:%S') as createTimeS,a.apply_date as applyDate,
|
|
|
date_format(a.update_time,'%Y-%m-%d %H:%I:%S') as updateTimeS,b.name as aname,tm.buyer_name userName,
|
|
date_format(a.update_time,'%Y-%m-%d %H:%I:%S') as updateTimeS,b.name as aname,tm.buyer_name userName,
|
|
|
a.patent_amount as patentAmount,a.delaying_amount delayingAmount ,a.recovery_amount
|
|
a.patent_amount as patentAmount,a.delaying_amount delayingAmount ,a.recovery_amount
|
|
|
recoveryAmount, c.commodity_name projectName , c.id tid,tm.salesman_name salesmanName ,
|
|
recoveryAmount, c.commodity_name projectName , c.id tid,tm.salesman_name salesmanName ,
|
|
|
c.receiver_name techName, tm.dep_name depName,ia.name inputName
|
|
c.receiver_name techName, tm.dep_name depName,ia.name inputName
|
|
|
- from patent_new a left join admin b on a.aid=b.id
|
|
|
|
|
- left join t_order_task c
|
|
|
|
|
- on a.tid =c.id left join t_order_mid tm on
|
|
|
|
|
- c.order_no =tm.order_no
|
|
|
|
|
- left
|
|
|
|
|
- join admin ia on a.input_id =ia.id
|
|
|
|
|
|
|
+ from patent_new a left join admin b on a.aid=b.id
|
|
|
|
|
+ left join t_order_task c on a.tid =c.id left join t_order_mid tm on c.order_no =tm.order_no
|
|
|
|
|
+ left join admin ia on a.input_id =ia.id
|
|
|
<if test="shiro ==1">
|
|
<if test="shiro ==1">
|
|
|
left join admin e on e.department_id=c.id
|
|
left join admin e on e.department_id=c.id
|
|
|
</if>
|
|
</if>
|
|
|
where 1=1
|
|
where 1=1
|
|
|
<if test="shiro ==0">
|
|
<if test="shiro ==0">
|
|
|
|
|
+ <if test="isFollow ==0">
|
|
|
and a.aid = #{aid,jdbcType=VARCHAR}
|
|
and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
|
|
+ </if>
|
|
|
|
|
+ <if test="isFollow ==1">
|
|
|
|
|
+ and a.input_id = #{aid,jdbcType=VARCHAR}
|
|
|
|
|
+ </if>
|
|
|
</if>
|
|
</if>
|
|
|
<if test="shiro ==1">
|
|
<if test="shiro ==1">
|
|
|
and e.id = #{aid,jdbcType=VARCHAR}
|
|
and e.id = #{aid,jdbcType=VARCHAR}
|