合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java

@@ -41,7 +41,12 @@ public class TpBuildingOwnerInfo implements Serializable {
      * 身份证号码
      */
     private String idCard;
-
+    
+    /**
+     * 期/区
+     */
+    private String phase;
+    
     /**
      * 楼栋
      */

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.constant.Constant;
@@ -533,18 +534,48 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             for (int j = 3; j <= lastRowNum; j++) {
                 Row row = sheet.getRow(j);
                 TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-                String building = row.getCell(0).getStringCellValue();
-                String unit = row.getCell(1).getStringCellValue();
-                String level = row.getCell(2).getStringCellValue();
-                String roomNo = row.getCell(3).getStringCellValue();
-                String ownerName = row.getCell(4).getStringCellValue();
-                String ownerTel = row.getCell(5).getStringCellValue();
+                String phase = row.getCell(0).getStringCellValue().trim();
+                String building = row.getCell(1).getStringCellValue().trim();
+                String unit = row.getCell(2).getStringCellValue().trim();
+                String level = row.getCell(3).getStringCellValue().trim();
+                String roomNo = row.getCell(4).getStringCellValue().trim();
+                String ownerName = row.getCell(5).getStringCellValue().trim();
+                String ownerTel = row.getCell(6).getStringCellValue().trim();
+                int currentRow = j+1;
+                if (StringUtils.isEmpty(phase)){
+                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    return responseBean;
+                }
+                if (StringUtils.isEmpty(building)){
+                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    return responseBean;
+                }
+                if (StringUtils.isEmpty(unit)){
+                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    return responseBean;
+                }
+                if (StringUtils.isEmpty(level)){
+                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    return responseBean;
+                }
+                if (StringUtils.isEmpty(roomNo)){
+                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    return responseBean;
+                }
+                if (StringUtils.isEmpty(ownerName)){
+                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    return responseBean;
+                }
+                if (StringUtils.isEmpty(ownerTel)){
+                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    return responseBean;
+                }
                 //校验手机号码
                 if (!AccountValidatorUtil.isPhone(ownerTel)){
                     responseBean.addError("请输入正确手机号:" + ownerTel);
                     return responseBean;
                 }
-                String buildingInfo = building + unit + level + roomNo;
+                String buildingInfo = phase + building + unit + level + roomNo;
                 if (temBuildingList.contains(buildingInfo)){
                     logger.info("存在重复房源:{}",buildingInfo);
                     responseBean.addError("存在重复房源:"+ buildingInfo);
@@ -559,6 +590,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 temBuildingList.add(buildingInfo);
                 temTelList.add(ownerTel);
                 //构建数据
+                tpBuildingOwnerInfo.setPhase(phase);
                 tpBuildingOwnerInfo.setBuilding(building);
                 tpBuildingOwnerInfo.setUnit(unit);
                 tpBuildingOwnerInfo.setLevel(level);

CODE/smart-community/property-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml

@@ -35,11 +35,11 @@
     </select>
 
     <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
-        insert into tp_building_owner_info(community_id,id_card, building,unit, `level`,
+        insert into tp_building_owner_info(community_id,id_card, phase, building,unit, `level`,
         room_no,owner_name,owner_tel,gender,pair_status,verify_status,create_user,create_date,update_user,update_date)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.communityId},#{item.idCard},#{item.building},#{item.unit}, #{item.level},#{item.roomNo},#{item.ownerName},
+            (#{item.communityId},#{item.idCard},#{item.phase},#{item.building},#{item.unit}, #{item.level},#{item.roomNo},#{item.ownerName},
             #{item.ownerTel},#{item.gender},#{item.pairStatus},#{item.verifyStatus},#{item.createUser},#{item.createDate},#{item.updateUser},#{item.updateDate})
         </foreach>
     </insert>

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -12,6 +12,9 @@
       </el-form-item>
     </el-form>
     <el-table ref="multipleTable" :data="list" border tooltip-effect="dark" style="width: 100%; margin-top: 20px;">
+      <el-table-column label="期/区" align="center">
+        <template slot-scope="scope">{{ scope.row.phase }}</template>
+      </el-table-column>
       <el-table-column label="栋" align="center">
         <template slot-scope="scope">{{ scope.row.building }}</template>
       </el-table-column>

VUECODE/smart-property-manage/src/views/owner/index.vue

@@ -31,7 +31,10 @@
       <el-table-column prop="ownerName" label="姓名" align="center"/>
       <el-table-column prop="ownerTel" label="手机号" align="center" />
       <el-table-column prop="gender" label="性别" align="center">
-        <template slot-scope="scope">{{ scope.row.gender =='1' ? '男':'女' }}</template>
+        <template slot-scope="scope">
+          <span v-if="scope.row.gender==1">{{ '男' }}</span>
+          <span v-if="scope.row.gender==2">{{ '女' }}</span>
+        </template>      
       </el-table-column>
       <el-table-column prop="idCard" label="身份证号" align="center" />
       <!-- <el-table-column prop="name" label="所在户" width="180" /> -->