房屋名称

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java

@@ -160,12 +160,21 @@ public class IcResiUserServiceImpl implements IcResiUserService {
                 resultMap.put("GRID_ID",gridInfoMap.get(resultMap.get("GRID_ID")).getGridName());
             }
             if(null !=houseInfoMap &&houseInfoMap.containsKey(resultMap.get("HOME_ID"))){
+                String homeId=resultMap.get("HOME_ID").toString();
+                resultMap.put("HOME_ID_VALUE",homeId);
+
                 String buildName=houseInfoMap.get(resultMap.get("HOME_ID")).getBuildingName();
                 resultMap.put("BUILD_NAME",buildName);
+
                 String neighBorName=houseInfoMap.get(resultMap.get("HOME_ID")).getNeighborHoodName();
                 resultMap.put("VILLAGE_NAME",neighBorName);
+
                 String unitName=houseInfoMap.get(resultMap.get("HOME_ID")).getUnitName();
                 resultMap.put("UNIT_NAME",unitName);
+
+                String doorName=houseInfoMap.get(resultMap.get("HOME_ID")).getDoorName();
+                resultMap.put("DOOR_NAME",doorName);
+
                 String houseType=houseInfoMap.get(resultMap.get("HOME_ID")).getHouseType();
                 //房屋类型，1楼房，2平房，3别墅
                 resultMap.put("HOUSE_TYPE","");
@@ -176,9 +185,8 @@ public class IcResiUserServiceImpl implements IcResiUserService {
                 }else if("3".equals(houseType)){
                     resultMap.put("HOUSE_TYPE","别墅");
                 }
-                String doorName=houseInfoMap.get(resultMap.get("HOME_ID")).getDoorName();
+
-                resultMap.put("DOOR_NAME",doorName);
+                resultMap.put("HOME_ID",neighBorName.concat(buildName).concat(unitName).concat(doorName));
-                resultMap.put("HOME_NAME",neighBorName.concat(buildName).concat(unitName).concat(doorName));
             }
             if(resultMap.containsKey("GENDER")){
                 String genderValue=resultMap.get("GENDER").toString();

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java

@@ -122,9 +122,9 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         //list.add(new TableHeaderResultDTO("小区","VILLAGE_NAME","input"));
         //list.add(new TableHeaderResultDTO("楼栋","BUILD_NAME","input"));
         //list.add(new TableHeaderResultDTO("单元","UNIT_NAME","input"));
-        list.add(new TableHeaderResultDTO("所在家庭","HOME_NAME","input"));
+        //list.add(new TableHeaderResultDTO("所在家庭","HOME_NAME","input"));
         list.addAll(baseDao.queryTableHeaderList(formDto.getCustomerId(),formDto.getFormCode()));
-        list.add(new TableHeaderResultDTO("需求分类","DEMAND_NAME","input"));
+        //list.add(new TableHeaderResultDTO("需求分类","DEMAND_NAME","input"));
         list.add(new TableHeaderResultDTO("房屋类型","HOUSE_TYPE","input"));
         return list;
     }