审核

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

@@ -89,6 +89,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     private TpLevelMapper tpLevelMapper;
     
+    @Autowired
+    private TpRoomNoMapper tpRoomNoMapper;
+    
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
     @Override
@@ -991,11 +994,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             throw new WisdomException("编号:%s 小区不存在!", communityId);
         }
     
-        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<TpRoomNo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("community_id", communityId);
         queryWrapper.eq("level_id", levelId);
     
-        List<TpBuildingOwnerInfo> tpLevelList = tpBuildingOwnerInfoMapper.selectList(queryWrapper);
+        List<TpRoomNo> tpLevelList = tpRoomNoMapper.selectList(queryWrapper);
         responseBean.addSuccess(tpLevelList);
     
         return responseBean;

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

@@ -69,8 +69,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	@Autowired
 	private TpRoomNoMapper tpRoomNoMapper;
 	
-	@Autowired
-	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 	@Autowired
 	private TaUserVerifyMapper taUserVerifyMapper;
 	
@@ -387,18 +385,18 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		//审核是否通过
 		InfoPass(type,id);
 		if (type.equals("end")) {
-			tpBuildingOwnerInfoMapper.deleteById(id);
+			tpRoomNoMapper.deleteById(id);
 		}
 		//删除楼层
 		if(type.equals("roomNo")){
 			TpLevel tpLevel= tpLevelMapper.selectById(id);
-			QueryWrapper<TpBuildingOwnerInfo> Info = new QueryWrapper<>();
+			QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
 			Info.eq("community_id", tpLevel.getCommunityId());
 			Info.eq("phase_id", tpLevel.getPhaseId());
 			Info.eq("building_id",tpLevel.getBuildingId());
 			Info.eq("unit_id", tpLevel.getUnitId());
 			Info.eq("level_id", tpLevel.getId());
-			tpBuildingOwnerInfoMapper.delete(Info);
+			tpRoomNoMapper.delete(Info);
 			tpLevelMapper.deleteById(id);
 		}
 
@@ -416,7 +414,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			Integer tpLevelID=null;
 
 			TpLevel levelevel = tpLevelMapper.selectOne(tpLevel);
-			QueryWrapper<TpBuildingOwnerInfo> Info = new QueryWrapper<>();
+			QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
 			Info.eq("community_id", tpUnit.getCommunityId());
 			Info.eq("phase_id", tpUnit.getPhaseId());
 			Info.eq("building_id",tpUnit.getBuildingId());
@@ -426,7 +424,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			}
 
 			//先删除所有房间
-			tpBuildingOwnerInfoMapper.delete(Info);
+			tpRoomNoMapper.delete(Info);
 			//再删除所有楼层
 			tpLevelMapper.delete(tpLevel);
 			//删除此单元
@@ -463,16 +461,16 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			}
 			//查询房间
 			List<TpLevel> levelList= tpLevelMapper.selectList(tpLevel);
-			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
+			QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
 			if (null!=levelList) {
 				for (TpLevel level:levelList) {
-					tpBuildingOwnerInfo.eq("phase_id", level.getPhaseId());
-					tpBuildingOwnerInfo.eq("community_id", level.getCommunityId());
-					tpBuildingOwnerInfo.eq("building_id", level.getBuildingId());
-					tpBuildingOwnerInfo.eq("unit_id", level.getUnitId());
-					tpBuildingOwnerInfo.eq("level_id", level.getId());
+					tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
+					tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
+					tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
+					tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
+					tpRoomNoQueryWrapper.eq("level_id", level.getId());
 					//先删除所有房间
-					tpBuildingOwnerInfoMapper.delete(tpBuildingOwnerInfo);
+					tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
 				}
 			}
 
@@ -508,14 +506,14 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 					//查询房间
 					TpLevel level= tpLevelMapper.selectOne(tpLevel);
 					if (null!=level) {
-						QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
-						tpBuildingOwnerInfo.eq("phase_id", level.getPhaseId());
-						tpBuildingOwnerInfo.eq("community_id", level.getCommunityId());
-						tpBuildingOwnerInfo.eq("building_id", level.getBuildingId());
-						tpBuildingOwnerInfo.eq("unit_id", level.getUnitId());
-						tpBuildingOwnerInfo.eq("level_id", level.getId());
+						QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
+						tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
+						tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
+						tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
+						tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
+						tpRoomNoQueryWrapper.eq("level_id", level.getId());
 						//先删除所有房间
-						tpBuildingOwnerInfoMapper.delete(tpBuildingOwnerInfo);
+						tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
 				}
 					//再删除所有楼层
 					tpLevelMapper.delete(tpLevel);
@@ -628,7 +626,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		ResponseBean responseBean = new ResponseBean();
 		if (type.equals("end")) {
 			//判断书否有已审核人员
-			TpBuildingOwnerInfo info = tpBuildingOwnerInfoMapper.selectById(id);
+			TpRoomNo info = tpRoomNoMapper.selectById(id);
 			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
 			taUserVerify.eq("community_id", info.getCommunityId())
 					.eq("phase_id", info.getPhaseId())

VUECODE/smart-property-manage/src/views/building/buildingdata/BuildingBatchImport.vue

@@ -25,7 +25,7 @@
         <template slot-scope="scope">{{ scope.row.levelName }}</template>
       </el-table-column>
       <el-table-column label="户号/室号" align="center">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+        <template slot-scope="scope">{{ scope.row.roomNoName }}</template>
       </el-table-column>
     </el-table>
     <div class="block">