diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java
index 831fa60f9..c0843c6cb 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java
@@ -23,7 +23,7 @@ public interface PileBillingTemplateMapper {
 	 * @param id 计费模板主键
 	 * @return 计费模板
 	 */
-	public PileBillingTemplate selectPileBillingTemplateById(Long id);
+	PileBillingTemplate selectPileBillingTemplateById(Long id);
 
 	/**
 	 * 查询计费模板列表
@@ -31,7 +31,7 @@ public interface PileBillingTemplateMapper {
 	 * @param pileBillingTemplate 计费模板
 	 * @return 计费模板集合
 	 */
-	public List<PileBillingTemplate> selectPileBillingTemplateList(PileBillingTemplate pileBillingTemplate);
+	List<PileBillingTemplate> selectPileBillingTemplateList(PileBillingTemplate pileBillingTemplate);
 
 	/**
 	 * 新增计费模板
@@ -39,7 +39,7 @@ public interface PileBillingTemplateMapper {
 	 * @param pileBillingTemplate 计费模板
 	 * @return 结果
 	 */
-	public int insertPileBillingTemplate(PileBillingTemplate pileBillingTemplate);
+	int insertPileBillingTemplate(PileBillingTemplate pileBillingTemplate);
 
 	/**
 	 * 修改计费模板
@@ -47,7 +47,7 @@ public interface PileBillingTemplateMapper {
 	 * @param pileBillingTemplate 计费模板
 	 * @return 结果
 	 */
-	public int updatePileBillingTemplate(PileBillingTemplate pileBillingTemplate);
+	int updatePileBillingTemplate(PileBillingTemplate pileBillingTemplate);
 
 	/**
 	 * 删除计费模板
@@ -55,7 +55,7 @@ public interface PileBillingTemplateMapper {
 	 * @param id 计费模板主键
 	 * @return 结果
 	 */
-	public int deletePileBillingTemplateById(Long id);
+	int deletePileBillingTemplateById(Long id);
 
 	/**
 	 * 批量删除计费模板
@@ -63,7 +63,7 @@ public interface PileBillingTemplateMapper {
 	 * @param ids 需要删除的数据主键集合
 	 * @return 结果
 	 */
-	public int deletePileBillingTemplateByIds(Long[] ids);
+	int deletePileBillingTemplateByIds(Long[] ids);
 
 	/**
 	 * 批量删除计费模板详情
@@ -71,7 +71,7 @@ public interface PileBillingTemplateMapper {
 	 * @param templateCodes 需要删除的templateCode集合
 	 * @return 结果
 	 */
-	public int deletePileBillingDetailByTemplateCodes(@Param("templateCodes") List<String> templateCodes);
+	int deletePileBillingDetailByTemplateCodes(@Param("templateCodes") List<String> templateCodes);
 
 	/**
 	 * 批量新增计费模板详情
@@ -79,7 +79,7 @@ public interface PileBillingTemplateMapper {
 	 * @param pileBillingDetailList 计费模板详情列表
 	 * @return 结果
 	 */
-	public int batchPileBillingDetail(List<PileBillingDetail> pileBillingDetailList);
+	int batchPileBillingDetail(List<PileBillingDetail> pileBillingDetailList);
 
 
 	/**
@@ -88,7 +88,7 @@ public interface PileBillingTemplateMapper {
 	 * @param templateCode 计费模板code
 	 * @return 结果
 	 */
-	public int deletePileBillingDetailByTemplateCode(String templateCode);
+	int deletePileBillingDetailByTemplateCode(String templateCode);
 
 	/**
 	 * 查询公共计费模板列表
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
index 58ebe27ad..837fae4c0 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
@@ -380,14 +380,14 @@
             t6.service_price AS valleyServicePrice,
             t6.apply_time AS valleyApplyDate
         FROM
-            pile_billing_relation t1
-            JOIN pile_billing_template t2 ON t1.billing_template_code = t2.template_code
+            pile_basic_info t1
+            JOIN pile_billing_template t2 ON t1.station_id = t2.station_id and t2.status = '1'
             JOIN pile_billing_detail t3 ON t3.template_code = t2.template_code AND t3.time_type = '1'
             JOIN pile_billing_detail t4 ON t4.template_code = t2.template_code AND t4.time_type = '2'
             JOIN pile_billing_detail t5 ON t5.template_code = t2.template_code AND t5.time_type = '3'
             JOIN pile_billing_detail t6 ON t6.template_code = t2.template_code AND t6.time_type = '4'
         WHERE
-            t1.pile_sn = #{pileSn,jdbcType=VARCHAR};
+            t1.sn = #{pileSn,jdbcType=VARCHAR};
     </select>
 
     <select id="selectBillingTemplateByTemplateId" resultType="com.jsowell.pile.vo.web.BillingTemplateVO">