Browse Source

补充阀控记录信息

oppadmin 4 năm trước cách đây
mục cha
commit
148b6c0ea5

+ 0 - 2
smart-city-platform/src/main/java/com/bz/smart_city/dao/pay/archives/PayBaseCustomerandmeterrelaMapper.java

@@ -63,8 +63,6 @@ public interface PayBaseCustomerandmeterrelaMapper {
     public List<PayAccountInfo> selectAccountMeterInfo (@Param("siteId") Integer siteId, @Param("customerId")Integer customerId,@Param("metercode")String metercode);
     public List<PayAccountInfo> selectMeterElenoMeterInfo (@Param("siteId") Integer siteId, @Param("customerId")Integer customerId,@Param("metereleno")String metereleno);
 
-    public List<PayAccountInfo> selectMeterElenoMeterInfo (@Param("siteId") Integer siteId, @Param("customerId")Integer customerId,@Param("metereleno")String metereleno);
-
     public int updateAccountInfo(@Param("accountname")String accountname,@Param("accountnumber")String accountnumber,@Param("metercode")String metercode,@Param("idtype")Integer idtype,
                                  @Param("idcardno")String idcardno,@Param("telephone")String telephone,@Param("officeId")BigInteger officeId,
                                  @Param("housetype")Integer housetype,@Param("customergroup")Integer customergroup,@Param("updateBy")Integer updateBy,

+ 0 - 2
smart-city-platform/src/main/java/com/bz/smart_city/entity/pay/AmountWaterUsedAmount.java

@@ -118,8 +118,6 @@ public class AmountWaterUsedAmount {
     @ApiModelProperty(value = "水表电子号")
     private String metereleno;
 
-    @ApiModelProperty(value = "水表电子号")
-    private String metereleno;
 
 
 }

+ 8 - 2
smart-city-platform/src/main/resources/mapper/pay/PayControlRecordMapper.xml

@@ -15,6 +15,8 @@
         pcr.update_by,
         pcr.update_date,
         pcr.remarks,
+        pcr.site_id,
+        pcr.customer_id,
         pcrule.name as controlRuleIdName
         from pay_control_record pcr
         left join pay_control_rule pcrule on pcr.control_rule_id = pcrule.id
@@ -43,7 +45,9 @@
         pcr.update_by,
         pcr.update_date,
         pcr.del_flag,
-        pcr.remarks
+        pcr.remarks,
+        pcr.site_id,
+        pcr.customer_id
         )
         values(
         #{payControlRecord.accountId},
@@ -57,7 +61,9 @@
         #{payControlRecord.createBy},
         #{payControlRecord.createDate},
         0,
-        #{payControlRecord.remarks}
+        #{payControlRecord.remarks},
+        #{payControlRecord.siteId},
+        #{payControlRecord.customerId},
         )
 
     </insert>