Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

         List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
         
         //批量插入
-        // tpBuildingOwnerInfoMapper.batchInsert(list);
+        list.forEach(e -> {
+            e.setOrgId(userElement.getOrgId());
+            e.setVerifyStatus("0");
+            e.setPairStatus("o");
+            e.setCreateUser(userElement.getUserId());
+            e.setCreateDate(LocalDateTime.now());
+        });
+        this.saveBatch(list);
         
         //构造数据
         for (TpBuildingOwnerInfo tpBuildingOwnerInfo : list){

src/main/resources/mapper/property/TpBuildingOwnerInfoMapper.xml

             u.unit_name,
             u.level_name,
             u.room_no_name,
-            u.id AS userVerifyId,
+            u.ta_user_verify_id AS userVerifyId,
             u.org_id AS orgId,
-            u.phone AS ownerTel,
+            u.owner_tel AS ownerTel,
             u.owner_name AS ownerName,
             u.id_card AS idCard,
             u.verify_status AS verifyStatus,
-            u.verify_name AS updateName,
+            u.update_user AS updateName,
             u.create_date AS createDate
         FROM
-            ta_user_verify u
+        tp_building_owner_info u
         WHERE
 
         u.org_id=#{tpBuildingOwnerInfo.orgId,jdbcType=INTEGER}
             and u.owner_name like concat('%',#{tpBuildingOwnerInfo.ownerName,jdbcType=VARCHAR},'%')
         </if>
         <if test="tpBuildingOwnerInfo.ownerTel != null and tpBuildingOwnerInfo.ownerTel != ''">
-            and u.phone like concat('%',#{tpBuildingOwnerInfo.ownerTel,jdbcType=VARCHAR},'%')
+            and u.owner_tel like concat('%',#{tpBuildingOwnerInfo.ownerTel,jdbcType=VARCHAR},'%')
         </if>
         <if test="tpBuildingOwnerInfo.idCard != null and tpBuildingOwnerInfo.idCard != ''">
             and u.id_card like concat('%',#{tpBuildingOwnerInfo.idCard,jdbcType=VARCHAR},'%')