|
|
@@ -418,27 +418,23 @@
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
|
|
|
- <select id="selectPatentNewList"
|
|
|
- resultType="com.goafanti.patent.bo.PatentNewBo">
|
|
|
- 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') as
|
|
|
- applyDates,a.uid,a.salesman_remind salesmanRemind,
|
|
|
- date_format(a.authorization_date ,'%Y-%m-%d ')as
|
|
|
- authorizationDates,a.province,a.years ,
|
|
|
- a.applicant,a.contact_mobile as contactMobile,a.email,a.certificate_url as certificateUrl,
|
|
|
- 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,
|
|
|
+ <select id="selectPatentNewList" resultType="com.goafanti.patent.bo.PatentNewBo">
|
|
|
+ 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.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,
|
|
|
+ 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.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
|
|
|
- recoveryAmount, c.commodity_name commodityName ,
|
|
|
- c.id tid,tm.salesman_name salesmanName ,c.receiver_name
|
|
|
- techName,tm.dep_name depName,ia.name inputName
|
|
|
+ recoveryAmount, c.commodity_name projectName , c.id tid,tm.salesman_name salesmanName ,
|
|
|
+ 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
|
|
|
+ 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
|
|
|
+ left
|
|
|
+ join admin ia on a.input_id =ia.id
|
|
|
<if test="shiro ==1">
|
|
|
left join admin e on e.department_id=c.id
|
|
|
</if>
|