优化

pro-base/src/main/java/com/idea/buildManage/service/ParkRoomBindDoorService.java

@@ -4,9 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.idea.buildManage.mapper.ParkRoomBindDoorMapper;
-import com.idea.buildManage.model.ParkRoom;
-import com.idea.buildManage.model.ParkRoomBindDoor;
-import com.idea.buildManage.model.ParkRoomBindDoorExample;
+import com.idea.buildManage.model.*;
 import com.idea.util.ApartmentUtil;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.common.support.Convert;
@@ -29,6 +27,12 @@ public class ParkRoomBindDoorService implements BaseService<ParkRoomBindDoor, Pa
     private ParkRoomBindDoorMapper modelMapper;
     @Autowired
     private ParkRoomService parkRoomService;
+    @Autowired
+    private ParkInfoService parkInfoService;
+    @Autowired
+    private ParkFloorDiscService parkFloorDiscService;
+    @Autowired
+    private MnpBuildingService mnpBuildingService;
 
     public PageInfo<ParkRoomBindDoor> list(Tablepar tablepar, ParkRoomBindDoor model, DateTrans dt) {
         PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
@@ -153,7 +157,28 @@ public class ParkRoomBindDoorService implements BaseService<ParkRoomBindDoor, Pa
         List<ParkRoomBindDoor> list = modelMapper.selectByExample(example);
         if(CollectionUtils.isNotEmpty(list)){
             ParkRoomBindDoor parkRoomBindDoor = list.get(0);
-            return parkRoomService.selectByPrimaryKey(parkRoomBindDoor.getParkRoomId());
+            ParkRoom parkRoom = parkRoomService.selectByPrimaryKey(parkRoomBindDoor.getParkRoomId());
+            if(null!=parkRoom){
+                if(StringUtils.isNotEmpty(parkRoom.getGroupId())){
+                    ParkInfo data = parkInfoService.selectByPrimaryKey(parkRoom.getGroupId());
+                    if(null!=data){
+                        parkRoom.setGroupName(data.getGroupName());
+                    }
+                }
+                if(StringUtils.isNotEmpty(parkRoom.getDiscId())){
+                    ParkFloorDisc data = parkFloorDiscService.selectByPrimaryKey(parkRoom.getDiscId());
+                    if(null!=data){
+                        parkRoom.setDiscName(data.getName());
+                    }
+                }
+                if(StringUtils.isNotEmpty(parkRoom.getBuildId())){
+                    MnpBuilding data = mnpBuildingService.selectByPrimaryKey(parkRoom.getBuildId());
+                    if(null!=data){
+                        parkRoom.setBuildName(data.getBuildNum());
+                    }
+                }
+            }
+            return parkRoom;
         }
         return null;
     }