优化代码加入创建费用和 公摊费用加入楼层

java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -34,6 +34,7 @@ public class RoomDto extends PageDto implements Serializable {
     private String roomId;
     private String[] roomIds;
     private String layer;
+    private String[] layers;
     private String builtUpArea;
     private String roomNum;
     private String unitId;
@@ -317,4 +318,12 @@ public class RoomDto extends PageDto implements Serializable {
     public void setFees(List<FeeDto> fees) {
         this.fees = fees;
     }
+
+    public String[] getLayers() {
+        return layers;
+    }
+
+    public void setLayers(String[] layers) {
+        this.layers = layers;
+    }
 }

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

@@ -694,6 +694,12 @@
         <if test="layer !=null and layer != ''">
             and t.layer= #{layer}
         </if>
+        <if test="layers != null">
+            and t.layer in
+            <foreach collection="layers" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="builtUpArea !=null and builtUpArea != ''">
             and t.built_up_area= #{builtUpArea}
         </if>

service-api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java

@@ -104,6 +104,10 @@ public class SaveRoomCreateFeeListener extends AbstractServiceApiListener {
         if (reqJson.containsKey("roomType")) {
             roomDto.setRoomType(reqJson.getString("roomType"));
         }
+        if(reqJson.containsKey("feeLayer") && !"全部".equals(reqJson.getString("feeLayer"))){
+            String[] layers = reqJson.getString("feeLayer").split("#");
+            roomDto.setLayers(layers);
+        }
         if ("1000".equals(reqJson.getString("locationTypeCd"))) {//小区
 
             roomDto.setCommunityId(reqJson.getString("communityId"));

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

@@ -96,6 +96,10 @@ public class FeeSharingBMOImpl implements IFeeSharingBMO {
         if (reqJson.containsKey("roomType")) {
             roomDto.setRoomType(reqJson.getString("roomType"));
         }
+        if(reqJson.containsKey("feeLayer") && !"全部".equals(reqJson.getString("feeLayer"))){
+            String[] layers = reqJson.getString("feeLayer").split("#");
+            roomDto.setLayers(layers);
+        }
         List<RoomDto> roomDtos = null;
         if ("1001".equals(scope)) {//小区
             roomDto.setCommunityId(reqJson.getString("objId"));