Merge remote-tracking branch 'origin2/dev' into origin2-dev

src/main/java/platform/modules/carrier/dao/BuildingDao.java

@@ -53,4 +53,6 @@ public interface BuildingDao extends BaseMapper<Building> {
     List<SkyImageCount> factoryBuildingCount();
 
     List<SkyImageCount> findEndContractByTime(@Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    Building findByNo(@Param("no") String no);
 }

src/main/java/platform/modules/carrier/service/BuildingService.java

@@ -903,4 +903,8 @@ public class BuildingService extends BaseService<Building> {
     public List<SkyImageCount> findEndContractByTime(String startTime, String endTime) {
         return buildingDao.findEndContractByTime(startTime, endTime);
     }
+
+    public Building findByNo(String no) {
+        return buildingDao.findByNo(no);
+    }
 }

src/main/java/platform/modules/carrier/service/CarrierQueryService.java

@@ -219,6 +219,50 @@ public class CarrierQueryService {
         return  building;
     }
 
+    /**
+     *
+     * @param no
+     * @param query
+     * @return
+     */
+    public Building checkinDetatilByNo(String no, CarrierQueryDto query) {
+        Building building = buildingService.findByNo(no);
+        Integer id = building.getId();
+        if (building != null){
+            building.setCarrier_attriute_desc(dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.FACTORY_TYPE, building.getCarrier_attriute() + ""));
+            building.setBuild_use_desc(dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.BUILDING_USES, building.getBuild_use() + ""));
+            building.setCarrier_structure_desc(dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.CARRIER_STRUCTURE, building.getCarrier_structure() + ""));
+            building.setDriving_type_desc(dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.DRIVING_TYPE, building.getDriving_type() + ""));
+            building.setDriving_load_desc(dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.DRIVING_LOAD, building.getDriving_load() + ""));
+            building.setDriving_spqn_desc(dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.DRIVING_SPQN, building.getDriving_spqn() + ""));
+            building.setFire_rating_desc(dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.FIRE_RATING, building.getFire_rating() + ""));
+            building.setSpqn_desc(dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.SPQN, building.getSpqn() + ""));
+
+            //最早入住时间
+            List<BuildFloor> buildingFloors = findBuildingFloors(id);
+            for (BuildFloor floor : buildingFloors) {
+                if (query.getCount() != null && query.getCount() == 1){
+                    floor.setEarliest_checkin_date(singleEarliestCheckinTime(query, floor).toString());
+                }
+                else {
+                    floor.setEarliest_checkin_date(multilayerEarliestCheckinTime(query));
+                }
+            }
+            building.setFloorList(buildingFloors);
+
+            //获取园区基本信息
+            Park park = parkService.findById(building.getPark_id());
+            Street street = streetService.findById(park.getStreet_id());
+            park.setStreetName(street.getName());
+            building.setPark(park);
+            //合同到期企业
+            List<ContractFloor> contractList = icContractService.findEndContractList(query.getDemandTime(), id);
+            building.setContractList(contractList);
+
+        }
+        return  building;
+    }
+
     /**
      * 获取方案详情的楼层
      *
@@ -228,4 +272,6 @@ public class CarrierQueryService {
     private List<BuildFloor> findBuildingFloors(Integer id) {
         return floorService.findCarrierQueryDetailFloors(id);
     }
+
+
 }

src/main/java/platform/modules/carrier/web/IndustrialCarrierController.java

@@ -171,6 +171,18 @@ public class IndustrialCarrierController {
         return ResponseMessage.success("success", building);
     }
 
+    /**
+     * 查询厂房信息
+     *
+     * @return
+     */
+    @RequestMapping("/buildingDetail/no/{no}")
+    public Object buildingDetail(@PathVariable String no, @RequestBody CarrierQueryDto query) {
+//        Building building = buildingService.findCheckinDetail(id, query);
+        Building building = carrierQueryService.checkinDetatilByNo(no, query);
+        return ResponseMessage.success("success", building);
+    }
+
     /**
      * 载体方案详情（重构）
      *

src/main/resources/mapper/carrier/BuildingDao.xml

@@ -632,4 +632,10 @@
             AND cf.contract_end <![CDATA[<]]> #{endTime}
         </if>
     </select>
+
+
+    <select id="findByNo" resultType="platform.modules.carrier.entity.Building">
+        select * from ic_building where no = #{no} and  del_flag = 0
+    </select>
+
 </mapper>