java110
2021-02-27 f995e849f439a2c063b6b643109b05364e29eb30
优化代码加入创建费用和 公摊费用加入楼层
4个文件已修改
23 ■■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/RoomDto.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-fee/src/main/java/com/java110/fee/bmo/importFee/impl/FeeSharingBMOImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/RoomDto.java
@@ -34,6 +34,7 @@
    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 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 @@
        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 @@
        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"));