bf

yiming
1 parent 66aa765f
Showing 2 changed files with 7 additions and 2 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
@@ -381,6 +381,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 				if("2".equals(bsthTLine.getExamineStatus())){//通过
 					//查出审核表的记录
 					bl=bsthTLineMapper.selectBsthTLineExamineById(bsthTLine.getId());
+					long id=bl.getId();
 					//查出历史当前数据的id
 					BsthTLine b=new BsthTLine();
 					b.setLineName(bl.getLineName());
@@ -404,7 +405,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 					bl.setId(bsthTLine1.getId());
 					i=bsthTLineMapper.updateBsthTLine(bl);
 					//删除审核表记录
-					bsthTLineMapper.deleteBsthTLineExamineById(new String[]{bl.getId().toString()});
+					bsthTLineMapper.deleteBsthTLineExamineById(new String[]{String.valueOf(id)});
 				}else{//未通过
 					//修改审核表状态
 					bl=new BsthTLine();
@@ -153,7 +153,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="airConditionerType != null  and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
 			<if test="sellTicketType != null  and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
 			<if test="serviceTime != null  and serviceTime != ''"> and service_time = #{serviceTime}</if>
-			<if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
+			<if test="lineDistance != null and lineDistance != ''"> and line_distance = #{lineDistance}</if>
 			<if test="lineCode != null  and lineCode != ''"> and line_code = #{lineCode}</if>
 			<if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>
 			<if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>
@@ -1134,6 +1134,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="timeSchedule != null">time_schedule,</if>
 			<if test="park != null">park,</if>
 			<if test="isWarrant != null">is_warrant,</if>
+			<if test="isWarrantStartTime != null">isWarrant_start_time,</if>
+			<if test="isWarrantEndTime != null">isWarrant_end_time,</if>
 			<if test="roadType != null">road_type,</if>
 			<if test="ticketPrice != null">ticket_price,</if>
 			<if test="firstStation != null">first_station,</if>
@@ -1219,6 +1221,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="timeSchedule != null">#{timeSchedule},</if>
 			<if test="park != null">#{park},</if>
 			<if test="isWarrant != null">#{isWarrant},</if>
+			<if test="isWarrantStartTime != null">#{isWarrantStartTime},</if>
+			<if test="isWarrantEndTime != null">#{isWarrantEndTime},</if>
 			<if test="roadType != null">#{roadType},</if>
 			<if test="ticketPrice != null">#{ticketPrice},</if>
 			<if test="firstStation != null">#{firstStation},</if>