提交代码

src/main/java/com/seeyon/apps/assetstenant/community/CommunitityVo.java

@@ -10,6 +10,16 @@ public class CommunitityVo {
     private String referenceAvgPrice;//参考均价
     private OaFileVo coverImg;//封面图
     private String communityName;//楼盘名称
+    private String greenRate;//绿化率
+    private String address;//地址
+    private String completeDate;//竣工时间
+    private String transactionOwnership;//交易权属
+    private String propertyType;//物业类型
+    private String lng;//经度
+    private String lat;//纬度
+    private String contactPhone;//联系电话
+    private String communityNo;//楼盘编号
+    private String communityDesc;//楼盘描述
 
     public String getReferenceTotalPrice() {
         return referenceTotalPrice;
@@ -66,4 +76,84 @@ public class CommunitityVo {
     public void setCommunityName(String communityName) {
         this.communityName = communityName;
     }
+
+    public String getGreenRate() {
+        return greenRate;
+    }
+
+    public void setGreenRate(String greenRate) {
+        this.greenRate = greenRate;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getCompleteDate() {
+        return completeDate;
+    }
+
+    public void setCompleteDate(String completeDate) {
+        this.completeDate = completeDate;
+    }
+
+    public String getTransactionOwnership() {
+        return transactionOwnership;
+    }
+
+    public void setTransactionOwnership(String transactionOwnership) {
+        this.transactionOwnership = transactionOwnership;
+    }
+
+    public String getPropertyType() {
+        return propertyType;
+    }
+
+    public void setPropertyType(String propertyType) {
+        this.propertyType = propertyType;
+    }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getCommunityNo() {
+        return communityNo;
+    }
+
+    public void setCommunityNo(String communityNo) {
+        this.communityNo = communityNo;
+    }
+
+    public String getCommunityDesc() {
+        return communityDesc;
+    }
+
+    public void setCommunityDesc(String communityDesc) {
+        this.communityDesc = communityDesc;
+    }
 }

src/main/java/com/seeyon/apps/assetstenant/community/CommunityLayoutAggVo.java

@@ -0,0 +1,52 @@
+package com.seeyon.apps.assetstenant.community;
+
+import java.util.List;
+import java.util.Map;
+
+public class CommunityLayoutAggVo {
+    private Integer totalCount;          // 总户型数
+    private Map<String, Integer> layoutTypeCount; // 户型类型统计（key: 三室/四室）
+    private Map<String, Integer> buildingLayoutCount; // 按楼栋统计户型
+    private String avgPrice;         // 平均参考均价
+    private List<CommunityLayoutVo> layoutList; // 原始户型列表
+
+    public Integer getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public Map<String, Integer> getLayoutTypeCount() {
+        return layoutTypeCount;
+    }
+
+    public void setLayoutTypeCount(Map<String, Integer> layoutTypeCount) {
+        this.layoutTypeCount = layoutTypeCount;
+    }
+
+    public Map<String, Integer> getBuildingLayoutCount() {
+        return buildingLayoutCount;
+    }
+
+    public void setBuildingLayoutCount(Map<String, Integer> buildingLayoutCount) {
+        this.buildingLayoutCount = buildingLayoutCount;
+    }
+
+    public String getAvgPrice() {
+        return avgPrice;
+    }
+
+    public void setAvgPrice(String avgPrice) {
+        this.avgPrice = avgPrice;
+    }
+
+    public List<CommunityLayoutVo> getLayoutList() {
+        return layoutList;
+    }
+
+    public void setLayoutList(List<CommunityLayoutVo> layoutList) {
+        this.layoutList = layoutList;
+    }
+}

src/main/java/com/seeyon/apps/assetstenant/community/CommunityLayoutVo.java

@@ -1,4 +1,107 @@
 package com.seeyon.apps.assetstenant.community;
 
+
+import com.seeyon.apps.assetstenant.file.OaFileVo;
+
 public class CommunityLayoutVo {
+
+    private String completeTime;          // 明细-竣工时间
+    private String saleStatus;            // 明细-售卖状态
+    private String buildType;             // 明细-建筑类型
+    private String decoration;          // 明细-装修标准
+    private String saleBuilding;        // 明细-售卖楼栋
+    private String saleLayout;        // 明细-售卖户型
+    private String openTime;              // 明细-开盘时间
+    private String deliveryTime;          // 明细-交房时间
+    private String avgPrice;        // 明细-参考均价
+    private OaFileVo img; //户型图
+    private String communityNo; //小区编号
+
+    public String getCompleteTime() {
+        return completeTime;
+    }
+
+    public void setCompleteTime(String completeTime) {
+        this.completeTime = completeTime;
+    }
+
+    public String getSaleStatus() {
+        return saleStatus;
+    }
+
+    public void setSaleStatus(String saleStatus) {
+        this.saleStatus = saleStatus;
+    }
+
+    public String getBuildType() {
+        return buildType;
+    }
+
+    public void setBuildType(String buildType) {
+        this.buildType = buildType;
+    }
+
+    public String getDecoration() {
+        return decoration;
+    }
+
+    public void setDecoration(String decoration) {
+        this.decoration = decoration;
+    }
+
+    public String getSaleBuilding() {
+        return saleBuilding;
+    }
+
+    public void setSaleBuilding(String saleBuilding) {
+        this.saleBuilding = saleBuilding;
+    }
+
+    public String getSaleLayout() {
+        return saleLayout;
+    }
+
+    public void setSaleLayout(String saleLayout) {
+        this.saleLayout = saleLayout;
+    }
+
+    public String getOpenTime() {
+        return openTime;
+    }
+
+    public void setOpenTime(String openTime) {
+        this.openTime = openTime;
+    }
+
+    public String getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(String deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public String getAvgPrice() {
+        return avgPrice;
+    }
+
+    public void setAvgPrice(String avgPrice) {
+        this.avgPrice = avgPrice;
+    }
+
+    public OaFileVo getImg() {
+        return img;
+    }
+
+    public void setImg(OaFileVo img) {
+        this.img = img;
+    }
+
+    public String getCommunityNo() {
+        return communityNo;
+    }
+
+    public void setCommunityNo(String communityNo) {
+        this.communityNo = communityNo;
+    }
 }

src/main/java/com/seeyon/apps/assetstenant/community/CommunityService.java

@@ -2,14 +2,13 @@ package com.seeyon.apps.assetstenant.community;
 
 import com.alibaba.fastjson.JSONObject;
 import com.seeyon.apps.assetstenant.config.AssetsTenantConfigProvider;
-import com.seeyon.apps.assetstenant.constants.RentConstants;
+import com.seeyon.apps.assetstenant.constants.AssetsTenantConstants;
 import com.seeyon.apps.assetstenant.file.OaFileVo;
 import com.seeyon.apps.assetstenant.po.PageQueryVo;
 import com.seeyon.cap4.form.bean.FormTableBean;
 import com.seeyon.ctp.common.AppContext;
 import com.seeyon.ctp.common.exceptions.BusinessException;
 import com.seeyon.ctp.common.filemanager.manager.AttachmentManager;
-import com.seeyon.ctp.organization.bo.V3xOrgMember;
 import com.seeyon.utils.form.*;
 import org.apache.commons.lang3.StringUtils;
 
@@ -24,7 +23,7 @@ public class CommunityService {
     private AssetsTenantConfigProvider configProvider = (AssetsTenantConfigProvider) AppContext.getBean("assetsTenantConfigProvider");
     private AttachmentManager attachmentManager = (AttachmentManager) AppContext.getBean("attachmentManager");
     private String getFormNo() {
-        return configProvider.getBizConfigByKey(RentConstants.ASSETS_FORMNO);
+        return configProvider.getBizConfigByKey(AssetsTenantConstants.COMMUNITYFORMNO);
     }
 
     public PageQueryVo pageQuery(JSONObject params) throws Exception {
@@ -38,10 +37,11 @@ public class CommunityService {
         List<CommunitityVo> vos = new ArrayList<>();
         Long count = FormTableExecutor.count(master,null, conditions);
         if(datas.size() > 0){
-            for (Object data : datas) {
-                Map<String,Object> map = (Map<String, Object>) data;
+            for (FormColumn data : datas) {
+                Map<String, Object> map = data.getFieldsMap();
                 CommunitityVo communitityVo = new CommunitityVo();
-                fillVo(map, communitityVo);
+                fillPageQueryVo(map, communitityVo);
+                communitityVo.setCommunityId(data.getId());
                 vos.add(communitityVo);
             }
             pageQueryVo.setDatas(vos);
@@ -60,64 +60,21 @@ public class CommunityService {
         return tableContext;
     }
 
-    // ====================== 填充楼栋VO（严格匹配UI字段） ======================
-    private void fillBuildingVo(Map<String, Object> map, CommunityBuildingVo vo) {
-        vo.setSort(getStringValue(map, "序号1"));
-        vo.setOpenTime(getStringValue(map, "明细-开盘时间"));
-        // 注意：如果数据库没有直接的"层数/单元数/在售户数/户梯比"字段，需要从表单字段映射
-        // 假设表单字段如下：
-//        vo.setLayers(getStringValue(map, "层数"));
-//        vo.setUnitCount(getInteger(map, "单元数"));
-//        vo.setSaleHouseCount(getInteger(map, "在售户数"));
-//        vo.setBuildType(getStr(map, "明细-建筑类型"));
-//        vo.setLiftRatio(getStr(map, "户梯比"));
-//        vo.setAvgPrice(getBigDecimal(map, "明细-参考均价"));
-    }
-
     private List<FormWhereCondition> buildConditions(JSONObject params, FormTableBean formTableBean) throws BusinessException {
         List<FormWhereCondition> conditions = new ArrayList<>();
-        if(StringUtils.isNotBlank(params.getString("communityId"))) {
+        if(StringUtils.isNotBlank(params.getString("communityId"))){
+            conditions.add(FormWhereCondition.build().display("ID").value(params.getString("communityId")));
+        }
+        return conditions;
+    }
+
+    private List<FormWhereCondition> buildSubTableQueryConditions(JSONObject params, FormTableBean formTableBean) throws BusinessException {
+        List<FormWhereCondition> conditions = new ArrayList<>();
+        if(StringUtils.isNotBlank(params.getString("communityId"))){
             conditions.add(FormWhereCondition.build().display("formmain_id").value(params.getString("communityId")));
         }
-        if(StringUtils.isNotBlank(params.getString("assetsStatus"))) {
-            conditions.add(FormWhereCondition.build().display("资产状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean,"资产状态",params.getString("assetsStatus"))));
-        }
-        if(StringUtils.isNotBlank(params.getString("manageType"))) {
-            conditions.add(FormWhereCondition.build().display("运营类型")
-                    .value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean,"运营类型",params.getString("manageType"))));
-        }
-        if(StringUtils.isNotBlank(params.getString("bizZone"))) {
-            conditions.add(FormWhereCondition.build().display("商圈位置")
-                    .value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean,"商圈位置",params.getString("bizZone"))));
-        }
-        if(StringUtils.isNotBlank(params.getString("renovationStatus"))) {
-            conditions.add(FormWhereCondition.build().display("装修情况")
-                    .value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean,"装修情况",params.getString("renovationStatus"))));
-        }
-        if(StringUtils.isNotBlank(params.getString("layout"))) {
-            conditions.add(FormWhereCondition.build().display("房屋户型")
-                    .value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean,"房屋户型",params.getString("layout"))));
-        }
-        if(StringUtils.isNotBlank(params.getString("rentFeeRange"))) {
-            String[] split = params.getString("rentFeeRange").split("-");
-            String rentFeeStart = null;
-            if(split.length > 1) {
-                rentFeeStart = split[0];
-            }
-            String rentFeeEnd = split[split.length - 1];
-            if(rentFeeStart != null) {
-                conditions.add(FormWhereCondition.build().display("评估-参考租金").clauseFactor(ClauseFactor.GE)
-                        .value(new BigDecimal(rentFeeStart)));
-            }
-            conditions.add(FormWhereCondition.build().display("评估-参考租金").clauseFactor(ClauseFactor.LE)
-                    .value(new BigDecimal(rentFeeEnd)));
-        }
-        if(StringUtils.isNotBlank(params.getString("features"))){
-            String[] features = params.getString("features").split(",");
-            for (Object feature : features) {
-                conditions.add(FormWhereCondition.build().display("基础配套").value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean,"基础配套",feature + ""))
-                        .index("FIND_IN_SET(?").clauseFactor(ClauseFactor.GT));
-            }
+        if(StringUtils.isNotBlank(params.getString("buildingNo"))) {
+            conditions.add(FormWhereCondition.build().display("明细-售卖楼栋").value(params.getString("buildingNo")));
         }
         return conditions;
     }
@@ -133,13 +90,14 @@ public class CommunityService {
             return communitityVo;
         }
         Map<String, Object> fieldsMap = formColumn.getFieldsMap();
-        fillVo(fieldsMap,communitityVo);
+        fillDetailVo(fieldsMap,communitityVo);
+        communitityVo.setCommunityId(formColumn.getId());
         return communitityVo;
     }
 
     public List<CommunityBuildingVo> queryBuildingList(JSONObject params) throws Exception {
         TableContext tableContext = getSubTableContext();
-        List<FormWhereCondition> conditions = buildConditions(params,tableContext.getTableBean());
+        List<FormWhereCondition> conditions = buildSubTableQueryConditions(params,tableContext.getTableBean());
         List<FormColumn> formColumns = FormTableExecutor.query(tableContext, null, conditions, true);
         if(formColumns.size() == 0) {
             return new ArrayList<>();
@@ -154,8 +112,9 @@ public class CommunityService {
                 communityBuildingVo.setBuildingNo(buildingNo);
                 communityBuildingVo.setBuildType(getStringValue(fieldsMap,"明细-建筑类型"));
                 communityBuildingVo.setOpenTime(getStringValue(fieldsMap,"明细-开盘时间"));
-                communityBuildingVo.setUnitNo(buildingNo);
+                communityBuildingVo.setUnitNo(getStringValue(fieldsMap,"明细-所属单元"));
                 communityBuildingVo.setSaleHouseCount(1);
+                buildingVoMap.put(buildingNo, communityBuildingVo);
             }else {
                 CommunityBuildingVo buildingVo = buildingVoMap.get(buildingNo);
                 buildingVo.setSaleHouseCount(buildingVo.getSaleHouseCount() + 1);
@@ -165,11 +124,91 @@ public class CommunityService {
         return buildingVos;
     }
 
-    public List<CommunityLayoutVo> queryLayoutList(JSONObject params) throws Exception {
-        TableContext tableContext = getSubTableContext();
-        List<FormWhereCondition> conditions = buildConditions(params,tableContext.getTableBean());
-        List<FormColumn> formColumns = FormTableExecutor.query(tableContext, null, conditions, true);
-        return null;
+    // ====================== 从子表获取户型列表 + 聚合统计 ======================
+    public CommunityLayoutAggVo getLayoutListWithAgg(JSONObject params) throws Exception {
+        TableContext sub = FormTableExecutor.sub(getFormNo(), "楼盘明细");
+        List<FormWhereCondition> conditions = buildSubTableQueryConditions(params, sub.getTableBean());
+        List<FormColumn> columnList = FormTableExecutor.query(sub, null, conditions, true);
+        List<CommunityLayoutVo> voList = new ArrayList<>();
+        Map<String, Integer> layoutTypeCount = new HashMap<>();
+        Map<String, Integer> buildingLayoutCount = new HashMap<>();
+        BigDecimal totalPrice = BigDecimal.ZERO;
+        int priceCount = 0;
+        for (FormColumn column : columnList) {
+            Map<String, Object> map = column.getFieldsMap();
+            CommunityLayoutVo vo = new CommunityLayoutVo();
+            fillLayoutVo(map, vo);
+            voList.add(vo);
+
+            // 1. 户型类型统计（从枚举值映射为名称，再提取类型）
+            String layoutType = extractLayoutType(vo.getSaleLayout());
+            layoutTypeCount.merge(layoutType, 1, Integer::sum);
+            // 2. 按楼栋统计户型
+            buildingLayoutCount.merge(vo.getSaleBuilding(), 1, Integer::sum);
+
+        }
+
+        CommunityLayoutAggVo agg = new CommunityLayoutAggVo();
+        agg.setLayoutList(voList);
+        agg.setTotalCount(voList.size());
+        agg.setLayoutTypeCount(layoutTypeCount);
+        agg.setBuildingLayoutCount(buildingLayoutCount);
+        return agg;
+    }
+
+    public List<CommunityLayoutVo> getLayoutList(JSONObject params) throws BusinessException {
+        TableContext sub = FormTableExecutor.sub(getFormNo(), "楼盘明细");
+        TableContext master = FormTableExecutor.master(getFormNo());
+        List<FormWhereCondition> masterTableQueryConditions = buildConditions(params, master.getTableBean());
+        FormColumn formColumn = FormTableExecutor.queryOne(master, masterTableQueryConditions, true);
+        if(formColumn == null) {
+            return null;
+        }
+        String communityNo = (String)formColumn.getFieldsMap().get("台账编号");
+        List<FormWhereCondition> conditions = buildSubTableQueryConditions(params, sub.getTableBean());
+        List<FormColumn> columnList = FormTableExecutor.query(sub, null, conditions, true);
+        List<CommunityLayoutVo> voList = new ArrayList<>();
+        Map<String,CommunityLayoutVo> voMap = new HashMap<>();
+        for (FormColumn column : columnList) {
+            Map<String, Object> map = column.getFieldsMap();
+            if(!voMap.containsKey(map.get("户型"))) {
+                CommunityLayoutVo vo = new CommunityLayoutVo();
+                vo.setSaleStatus(getStringValue(map, "明细-售卖状态"));
+                vo.setSaleBuilding(getStringValue(map, "明细-售卖楼栋"));
+                vo.setSaleLayout(getStringValue(map, "明细-售卖户型"));
+                vo.setCommunityNo(communityNo);
+                if(map.get("户型图片") != null) {
+                    vo.setImg(OaFileVo.getInstance(map.get("户型图片"),attachmentManager));
+                }
+                voMap.put((String)map.get("户型"),vo);
+            }
+        }
+        voList.addAll(voMap.values());
+        return voList;
+    }
+
+    // ====================== 填充户型VO（严格映射子表字段） ======================
+    private void fillLayoutVo(Map<String, Object> map, CommunityLayoutVo vo) throws BusinessException {
+        vo.setCompleteTime(getStringValue(map, "明细-竣工时间"));
+        vo.setSaleStatus(getStringValue(map, "明细-售卖状态"));
+        vo.setBuildType(getStringValue(map, "明细-建筑类型"));
+        vo.setDecoration(getStringValue(map, "明细-装修标准"));
+        vo.setSaleBuilding(getStringValue(map, "明细-售卖楼栋"));
+        vo.setSaleLayout(getStringValue(map, "明细-售卖户型"));
+        vo.setOpenTime(getStringValue(map, "明细-开盘时间"));
+        vo.setDeliveryTime(getStringValue(map, "明细-交房时间"));
+        vo.setAvgPrice(getStringValue(map, "明细-参考均价"));
+        // 若面积/总价需从其他表获取，在此补充逻辑
+        // vo.setArea(getBigDecimal(map, "户型面积"));
+        // vo.setTotalPrice(vo.getAvgPrice().multiply(vo.getArea()).setScale(2, RoundingMode.HALF_UP));
+    }
+
+    // ====================== 辅助方法：提取户型类型（如"三室两厅两卫" → "三室"） ======================
+    private String extractLayoutType(String saleLayoutName) {
+        if (StringUtils.isBlank(saleLayoutName)) return "其他";
+        if (saleLayoutName.contains("三室")) return "三室";
+        if (saleLayoutName.contains("四室")) return "四室";
+        return "其他";
     }
 
     private String getStringValue(Map<String, Object> fieldsMap,String key) {
@@ -180,18 +219,53 @@ public class CommunityService {
         return o + "";
     }
 
-    public void fillVo(Map<String, Object> fieldsMap,CommunitityVo communitityVo) throws BusinessException {
-        communitityVo.setCommunityId(getStringValue(fieldsMap,"资产编号")); //楼盘id
-        communitityVo.setCommunityName(getStringValue(fieldsMap,"品牌名称")); //楼盘名称
-        communitityVo.setFeatures(getStringValue(fieldsMap,"详情信息")); //楼盘特点
-        communitityVo.setRenovation(getStringValue(fieldsMap,"id")); //装修情况
-        communitityVo.setReferenceAvgPrice(getStringValue(fieldsMap,"资产状态")); //楼盘参考均价
-        communitityVo.setReferenceTotalPrice(getStringValue(fieldsMap,"资产类型"));//楼盘参考总价
-        V3xOrgMember member = null;
-        BigDecimal area = (BigDecimal)fieldsMap.get("评估-评估面积");
-        BigDecimal rentFee = (BigDecimal)fieldsMap.get("评估-参考租金");
-        if(fieldsMap.get("VR文件上传") != null) {
-            communitityVo.setCoverImg(OaFileVo.getInstance((Long)fieldsMap.get("VR文件上传"),attachmentManager));
+    public void fillPageQueryVo(Map<String, Object> fieldsMap,CommunitityVo communitityVo) throws BusinessException {
+        communitityVo.setCommunityName(getStringValue(fieldsMap,"楼盘名称")); //楼盘名称
+        communitityVo.setRenovation(getStringValue(fieldsMap,"装修标准")); //装修情况
+        communitityVo.setReferenceAvgPrice(getStringValue(fieldsMap,"参考均价")); //楼盘参考均价
+        communitityVo.setReferenceTotalPrice(getStringValue(fieldsMap,"参考总价"));//楼盘参考总价
+        communitityVo.setCommunityNo(getStringValue(fieldsMap,"台账编号"));
+        String lnglat = getStringValue(fieldsMap,"坐落经纬度");
+        if(StringUtils.isNotBlank(lnglat)) {
+            // 统一替换逗号为分号，然后分割，兼容 ; 和 , 两种格式
+            String[] lnglatArr = lnglat.replace(",", ";").split(";");
+            // 增加数组长度判断，防止越界异常
+            if (lnglatArr.length >= 2) {
+                communitityVo.setLng(lnglatArr[0].trim()); // trim() 去除多余空格
+                communitityVo.setLat(lnglatArr[1].trim());
+            }
+        }
+        if(fieldsMap.get("小区图片") != null) {
+            communitityVo.setCoverImg(OaFileVo.getInstance(fieldsMap.get("小区图片"),attachmentManager));
+        }
+    }
+
+    public void fillDetailVo(Map<String, Object> fieldsMap,CommunitityVo communitityVo) throws BusinessException {
+        communitityVo.setCommunityName(getStringValue(fieldsMap,"楼盘名称")); //楼盘名称
+        communitityVo.setRenovation(getStringValue(fieldsMap,"装修标准")); //装修情况
+        communitityVo.setFeatures(getStringValue(fieldsMap,"楼盘特色"));//楼盘特点
+        communitityVo.setGreenRate(getStringValue(fieldsMap,"绿化率"));//绿化率
+        communitityVo.setContactPhone(getStringValue(fieldsMap,"联系电话")); //联系电话
+        communitityVo.setReferenceAvgPrice(getStringValue(fieldsMap,"参考均价")); //楼盘参考均价
+        communitityVo.setReferenceTotalPrice(getStringValue(fieldsMap,"参考总价"));//楼盘参考总价
+        communitityVo.setAddress(getStringValue(fieldsMap,"楼盘地址")); //地址
+        communitityVo.setCompleteDate(getStringValue(fieldsMap,"竣工时间")); //竣工时间
+        communitityVo.setTransactionOwnership(getStringValue(fieldsMap,"交易权属")); //交易权属
+        communitityVo.setPropertyType(getStringValue(fieldsMap,"物业类型")); //物业类型
+        communitityVo.setCommunityNo(getStringValue(fieldsMap,"台账编号")); //楼盘编号
+        communitityVo.setCommunityDesc(getStringValue(fieldsMap,"小区详情")); //楼盘描述
+        String lnglat = getStringValue(fieldsMap,"坐落经纬度");
+        if(StringUtils.isNotBlank(lnglat)) {
+            // 统一替换逗号为分号，然后分割，兼容 ; 和 , 两种格式
+            String[] lnglatArr = lnglat.replace(",", ";").split(";");
+            // 增加数组长度判断，防止越界异常
+            if (lnglatArr.length >= 2) {
+                communitityVo.setLng(lnglatArr[0].trim()); // trim() 去除多余空格
+                communitityVo.setLat(lnglatArr[1].trim());
+            }
+        }
+        if(fieldsMap.get("小区图片") != null) {
+            communitityVo.setCoverImg(OaFileVo.getInstance(fieldsMap.get("小区图片"),attachmentManager));
         }
     }
 }