导入调整

pro-base/src/main/java/com/idea/buildManage/excel/ParkFloorDiscExcel.java

@@ -11,7 +11,7 @@ public class ParkFloorDiscExcel {
     private String groupName;
 
     @ExcelProperty(value = "分期名称")
-    private String name;
+    private String discName;
 
     @ExcelProperty(value = "房屋买卖单价（元/㎡）")
     private String unitPrice;

pro-base/src/main/java/com/idea/buildManage/excel/ParkFloorDiscListener.java

@@ -71,10 +71,10 @@ public class ParkFloorDiscListener extends AnalysisEventListener<ParkFloorDiscEx
                     if(StringUtils.isEmpty(excel.getGroupName())){
                         throw new RuntimeException("楼盘/小区名称为空");
                     }
-                    if(StringUtils.isEmpty(excel.getName())){
+                    if(StringUtils.isEmpty(excel.getDiscName())){
                         throw new RuntimeException("楼分期名称为空");
                     }
-                    data.setName(excel.getName());
+                    data.setName(excel.getDiscName());
                     // 判断小区是否存在
                     if(StringUtils.isEmpty(parkNameIdMap.get(excel.getGroupName()))){
                         throw new RuntimeException("楼盘/小区不存在");

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

@@ -67,6 +67,10 @@ public class HouseTypeService implements BaseService<HouseType, HouseTypeExample
         return modelMapper.deleteByExample(houseTypeExample);
     }
 
+    public List<HouseType> selectByExampleWithBLOBs(HouseTypeExample houseTypeExample) {
+        return modelMapper.selectByExampleWithBLOBs(houseTypeExample);
+    }
+
 
     /**
      * 查询指定
@@ -74,7 +78,7 @@ public class HouseTypeService implements BaseService<HouseType, HouseTypeExample
      * @return
      */
     public List<HouseType> listAll(HouseType model, DateTrans dt) {
-        return modelMapper.selectByExample(getCondition(model, dt));
+        return modelMapper.selectByExampleWithBLOBs(getCondition(model, dt));
     }
 
     private HouseTypeExample getCondition(HouseType model, DateTrans dt) {

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

@@ -199,13 +199,13 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
         ParkFloorDisc parkFloorDisc = selectByPrimaryKey(id);
         ParkFloorDiscRespson parkFloorDiscRespson = new ParkFloorDiscRespson();
         BeanUtil.copyProperties(parkFloorDisc,parkFloorDiscRespson);
-        HouseTypeExample houseTypeExample = new HouseTypeExample();
-        houseTypeExample.createCriteria().andDiscIdEqualTo(id);
-        List<HouseType> houseTypes = houseTypeService.selectByExample(houseTypeExample);
-        if(CollectionUtils.isNotEmpty(houseTypes)){
-            String json = JSON.toJSON(houseTypes).toString();
-            parkFloorDiscRespson.setHouseTypeStr(json);
-        }
+//        HouseTypeExample houseTypeExample = new HouseTypeExample();
+//        houseTypeExample.createCriteria().andDiscIdEqualTo(id);
+//        List<HouseType> houseTypes = houseTypeService.selectByExampleWithBLOBs(houseTypeExample);
+//        if(CollectionUtils.isNotEmpty(houseTypes)){
+//            String json = JSON.toJSON(houseTypes).toString();
+//            parkFloorDiscRespson.setHouseTypeStr(json);
+//        }
         return parkFloorDiscRespson;
     }