| 
														
															@@ -24,9 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     </resultMap> 
														 | 
														
														 | 
														
															     </resultMap> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     <sql id="selectMarkertPlanVo"> 
														 | 
														
														 | 
														
															     <sql id="selectMarkertPlanVo"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        select id, grade, discount_term, discount_amt, gasoil_discount_amt, dieseloil_discount_amt, vip_discounty_plus, coupon_plus, discount_plan_type, 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-         oil_name, station_id, station_name, status,create_by,create_time,update_by,update_time 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-          from markert_plan 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+       select p.id, p.grade, p.discount_term, p.discount_amt, p.gasoil_discount_amt, p.vip_discounty_plus, p.coupon_plus, p.discount_plan_type, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+         p.oil_name, p.station_id,d.dept_name as station_name, p.status,p.create_by,p.create_time,p.update_by,p.update_time 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+          from markert_plan p join sys_dept d on p.station_id = d.dept_id 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     </sql> 
														 | 
														
														 | 
														
															     </sql> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     <select id="selectMarkertPlanList" parameterType="MarkertPlan" resultMap="MarkertPlanResult"> 
														 | 
														
														 | 
														
															     <select id="selectMarkertPlanList" parameterType="MarkertPlan" resultMap="MarkertPlanResult"> 
														 |