Explorar el Código

列表新增费减字段

anderx hace 4 años
padre
commit
0698635924

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

@@ -282,5 +282,6 @@
     <include refid="Base_Column_List" />
     from patent_new_log
     where pid = #{id,jdbcType=INTEGER}
+    order by create_time desc
   </select>
 </mapper>

+ 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,
+		    select a.id,a.patent_no as patentNo,a.name,a.type,a.status,a.holders,a.inventor,c.cost_reduction 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 ,

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

@@ -47,6 +47,8 @@ public class PatentNewBo extends PatentNew{
 	private String projectName;
 	@Excel(name = "项目编号")
 	private Integer tid;
+	@Excel(name = "费减",readConverterExp = "0=无费减,1=有费减")
+	private Integer costReduction;
 	@Excel(name = "营销员")
 	private String salesmanName;
 	@Excel(name = "咨询师")