Browse Source

导出字段修改

anderx 4 years ago
parent
commit
0f9a46aec7

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml

@@ -419,7 +419,7 @@
 	</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,c.cost_reduction costReduction ,
+ 		    select a.id,a.patent_no as patentNo,a.name,a.type,a.status,a.holders,a.inventor,ifnull(c.cost_reduction,0) costReduction ,
 		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.aid ,

+ 1 - 1
src/main/java/com/goafanti/patent/bo/PatentNewBo.java

@@ -19,7 +19,7 @@ public class PatentNewBo extends PatentNew{
 	
 	@Excel(name = "专利名称")
 	private String name;
-	@Excel(name = "类型", readConverterExp="0=发明专利,1=使用新型,2=外观设计")
+	@Excel(name = "类型", readConverterExp="0=发明专利,1=用新型,2=外观设计")
 	private Integer type;
 	@Excel(name = "申请日期")
 	private String applyDates;