加入临时收费逻辑

java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml

@@ -802,7 +802,7 @@
         statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
-        t.room_type roomType,t.room_type
+        t.room_type roomType,t.room_type,f.floor_num floorNum
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'

service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java

@@ -284,12 +284,24 @@ public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInne
     @Override
     public List<ImportRoomFee> freshRoomIds(@RequestBody List<ImportRoomFee> importRoomFees) {
         for (ImportRoomFee importRoomFee : importRoomFees) {
-            List<Map> infos = roomServiceDaoImpl.getRoomInfos(BeanConvertUtil.beanCovertMap(importRoomFee));
+            List<Map> infos = null;
+            if(!StringUtil.isEmpty(importRoomFee.getRoomId()) && !importRoomFee.getRoomId().startsWith("-")){
+                Map paramIn = new HashMap();
+                paramIn.put("communityId",importRoomFee.getCommunityId());
+                paramIn.put("roomId",importRoomFee.getRoomId());
+                infos = roomServiceDaoImpl.getRoomInfos(BeanConvertUtil.beanCovertMap(importRoomFee));
+            }else{
+                infos = roomServiceDaoImpl.getRoomInfos(BeanConvertUtil.beanCovertMap(importRoomFee));
+            }
 
             if (infos == null || infos.size() < 1) {
                 continue;
             }
             importRoomFee.setRoomId(infos.get(0).get("roomId").toString());
+            importRoomFee.setFloorNum(infos.get(0).get("floorNum").toString());
+            importRoomFee.setUnitNum(infos.get(0).get("unitNum").toString());
+            importRoomFee.setRoomNum(infos.get(0).get("roomNum").toString());
+
         }
         return importRoomFees;
     }

service-front/src/main/java/com/java110/front/components/assetImport/ImportRoomFeeComponent.java

@@ -38,6 +38,17 @@ public class ImportRoomFeeComponent {
         return importRoomFeeSMOImpl.importExcelData(pd, uploadFile);
     }
 
+    /**
+     * 添加应用数据
+     *
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    public ResponseEntity<String> importTempData(IPageData pd) throws Exception {
+
+        return importRoomFeeSMOImpl.importTempData(pd);
+    }
+
     /**
      * 添加应用数据
      *

service-front/src/main/java/com/java110/front/smo/assetImport/IImportRoomFeeSMO.java

@@ -21,4 +21,6 @@ public interface IImportRoomFeeSMO {
      * @return ResponseEntity
      */
     public ResponseEntity<String> importExcelData(IPageData pd,  MultipartFile uploadFile) throws Exception;
+
+    ResponseEntity<String> importTempData(IPageData pd);
 }

service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java

@@ -5,12 +5,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.BaseComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.entity.assetImport.ImportRoomFee;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ImportExcelUtils;
 import com.java110.utils.util.StringUtil;
@@ -82,6 +84,16 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
         }
     }
 
+    @Override
+    public ResponseEntity<String> importTempData(IPageData pd) {
+        ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(paramIn,ImportRoomFee.class);
+        List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
+        rooms.add(importRoomFee);
+        return dealExcelData(pd, rooms, result);
+    }
+
     /**
      * 处理ExcelData数据
      *