批量安装BUG

smart-city-platform/src/main/java/com/bz/smart_city/entity/pay/archives/CustomerListInfo.java

@@ -23,4 +23,10 @@ public class CustomerListInfo {
     public BigInteger waterPropertyId;
     @ApiModelProperty(value = "结算方式", position =4 )
     public Integer calculateway;
+    @ApiModelProperty(value = "用户姓名",position = 5)
+    private String accountname;
+    @ApiModelProperty(value = "用户手机号",position = 6)
+    private String telephone;
+    @ApiModelProperty(value = "身份证号",position = 7)
+    private String idcardno;
 }

smart-city-platform/src/main/java/com/bz/smart_city/entity/pay/archives/MeterListInfo.java

@@ -13,10 +13,10 @@ import java.math.BigInteger;
 public class MeterListInfo {
     @ApiModelProperty(value = "水表编码", position =1 )
     public String metercode;
-    @ApiModelProperty(value = "用户姓名")
+    @ApiModelProperty(value = "用户姓名",position = 2)
     private String userName;
-    @ApiModelProperty(value = "用户手机号",position = 11)
+    @ApiModelProperty(value = "用户手机号",position = 3)
     private String userPhone;
-    @ApiModelProperty(value = "身份证号")
+    @ApiModelProperty(value = "身份证号",position = 4)
     private String idCard;
 }

smart-city-platform/src/main/java/com/bz/smart_city/entity/pay/archives/PayAccountInfo.java

@@ -21,4 +21,11 @@ public class PayAccountInfo {
     public BigInteger waterPropertyId;
     @ApiModelProperty(value = "结算方式", position =4 )
     public Integer calculateway;
+    @ApiModelProperty(value = "用户姓名",position = 5)
+    private String accountname;
+    @ApiModelProperty(value = "用户手机号",position = 6)
+    private String telephone;
+    @ApiModelProperty(value = "身份证号",position = 7)
+    private String idcardno;
+
 }

smart-city-platform/src/main/resources/mapper/PayBaseCustomerandmeterrelaMapper.xml

@@ -363,9 +363,9 @@
     <select id="selectAccountInfo" resultType="com.bz.smart_city.entity.pay.archives.MeterListInfo">
         select
         device.metercode as "metercode",
-        sil.user_name,
-        sil.user_phone,
-        sil.id_card
+        sil.user_name as accountname,
+        sil.user_phone as telephone,
+        sil.id_card as idcardno
         from pay_base_account account
         inner join sc_device device on account.id = device.account_id
         inner join sc_install_list sil on sil.device_id = device.id
@@ -389,9 +389,13 @@
         account.accountnumber as "accountnumber",
         account.calculateway as "calculateway",
         account.waterproperty_id as "waterPropertyId",
-        device.metercode as "metercode"
+        device.metercode as "metercode",
+        sil.user_name as accountname,
+        sil.user_phone as telephone,
+        sil.id_card as idcardno
         from pay_base_account account
         inner join sc_device device on account.id = device.account_id
+        inner join sc_install_list sil on sil.device_id = device.id
         <where>
             device.metercode not in(select metercode from pay_base_customerandmeterrela where businessstate = '1')
             <if test="metercode != null">