接口同步修改

smart-city-platform/src/main/java/com/bz/smart_city/dto/sync/MeterSyncDto.java

@@ -42,4 +42,6 @@ public class MeterSyncDto {
 
     @ApiModelProperty("设备型号  厂商/系列/型号")
     private String deviceType;
+    @ApiModelProperty("计费系统档案号")
+    private String meterCode;
 }

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

@@ -1197,6 +1197,7 @@
         sd.customer_id,
         sd.water_meter_no,
         sd.water_meter_file_no as file_no,
+        sd.metercode as meterCode,
         sd.status,
         sd.date_create,
         sd.date_update,
@@ -1209,10 +1210,10 @@
         where sd.status = 1
         and sd.customer_id = #{customerId}
         <if test="createDate != null and createDate != ''"> and DATE_FORMAT(sd.date_create, '%Y%m%d' ) = #{createDate}</if>
-        and sd.water_meter_file_no in <foreach collection="fileNo" item="item" open="(" separator="," close=")">#{item}</foreach>
+        and sd.metercode in <foreach collection="fileNo" item="item" open="(" separator="," close=")">#{item}</foreach>
     </select>
     <update id="updateMeterNo">
-        update sc_device set water_meter_file_no=#{meterCode}
+        update sc_device set metercode=#{meterCode}
         where water_meter_file_no=#{meterNo} and customer_id=#{customerId}
     </update>
 </mapper>

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

@@ -402,7 +402,7 @@
       customer_id, door_no, device_id, device_type_id, device_no, electronic_no, file_no, 
       new_meter_start, old_meter_end, image_url, old_image_url, user_name, user_phone, 
       is_in_plan, is_installed, is_accepted, plan_time, install_time, accept_time, remark, 
-      `status`, date_create, date_update, create_by, update_by, `floor`,account_id,id_card)
+      `status`, date_create, date_update, create_by, update_by, `floor`,account_id,id_card,metercode)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.siteId}, #{item.installPlanId}, #{item.installPlanDataId}, #{item.buildingId}, 
@@ -412,7 +412,7 @@
         #{item.userName}, #{item.userPhone}, #{item.isInPlan}, #{item.isInstalled}, #{item.isAccepted}, 
         #{item.planTime}, #{item.installTime}, #{item.acceptTime}, #{item.remark}, #{item.status}, 
         #{item.dateCreate}, #{item.dateUpdate}, #{item.createBy}, #{item.updateBy}, #{item.floor},#{item.account_id},#{item.idCard}
-        )
+        ,#{item.fileNo})
     </foreach>
   </insert>
 	<select id="queryInstallList" resultType="com.bz.smart_city.dto.assistant.InstallListDTO">