优化临时费用创建功能

java110-bean/src/main/java/com/java110/entity/assetImport/ImportRoomFee.java

@@ -10,6 +10,7 @@ public class ImportRoomFee {
     private String unitNum;
 
     private String roomNum;
+    private String roomName;
 
     private String carNum;
 
@@ -187,4 +188,12 @@ public class ImportRoomFee {
     public String getDeductFrom() { return deductFrom; }
 
     public void setDeductFrom(String deductFrom) { this.deductFrom = deductFrom; }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
 }

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

@@ -316,6 +316,7 @@ public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInne
             importRoomFee.setFloorNum(infos.get(0).get("floorNum").toString());
             importRoomFee.setUnitNum(infos.get(0).get("unitNum").toString());
             importRoomFee.setRoomNum(infos.get(0).get("roomNum").toString());
+            importRoomFee.setRoomName(importRoomFee.getFloorNum()+"-"+importRoomFee.getUnitNum()+"-"+importRoomFee.getRoomNum());
 
         }
         return importRoomFees;

service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java

@@ -151,8 +151,8 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
         for (ImportRoomFee importRoomFee : tmpImportRoomFees) {
-            if(StringUtil.isEmpty(importRoomFee.getRoomId())){
-                throw new IllegalArgumentException("房屋不存在，"+importRoomFee.getFloorNum()+"-"+importRoomFee.getUnitNum()+"-"+importRoomFee.getRoomNum());
+            if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
+                throw new IllegalArgumentException("房屋不存在，" + importRoomFee.getFloorNum() + "-" + importRoomFee.getUnitNum() + "-" + importRoomFee.getRoomNum());
             }
             for (OwnerDto tmpOwnerDto : ownerDtos) {
                 if (importRoomFee.getRoomId().equals(tmpOwnerDto.getRoomId())) {
@@ -212,6 +212,15 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
             feeAttrPo.setFeeId(payFeePo.getFeeId());
             feeAttrPos.add(feeAttrPo);
 
+            //todo 费用对象名称
+            feeAttrPo = new FeeAttrPo();
+            feeAttrPo.setCommunityId(communityId);
+            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME);
+            feeAttrPo.setValue(importRoomFee.getRoomName());
+            feeAttrPo.setFeeId(payFeePo.getFeeId());
+            feeAttrPos.add(feeAttrPo);
+
 
             if (!StringUtil.isEmpty(importRoomFee.getOwnerId())) {
                 feeAttrPo = new FeeAttrPo();