java110
2020-09-11 b889cb66aabba6553b7bc7027cf3d768abc58db1
优化代码
3个文件已修改
14 ■■■■ 已修改文件
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/meterWater/SaveMeterWaterListener.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -301,6 +301,7 @@
        <if test="floorId !=null and floorId != ''">
            and f.`floor_id`= #{floorId}
        </if>
        <if test="feeCoefficient !=null and feeCoefficient != ''">
            and t.fee_coefficient= #{feeCoefficient}
        </if>
@@ -344,6 +345,13 @@
            and t.community_id= #{communityId}
        </if>
        <if test="floorNum !=null and floorNum != ''">
            and f.`floor_num`= #{floorNum}
        </if>
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
    </select>
service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java
@@ -71,11 +71,11 @@
        //根据 业主来定位房屋信息
        if (reqJson.containsKey("ownerName") || reqJson.containsKey("idCard")) {
            queryRoomByOwnerInfo(apiRoomVo, reqJson, context);
            return;
        }
        RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class);
        //查询总记录数
        int total = roomInnerServiceSMOImpl.queryRoomsCount(BeanConvertUtil.covertBean(reqJson, RoomDto.class));
        apiRoomVo.setTotal(total);
service-api/src/main/java/com/java110/api/listener/meterWater/SaveMeterWaterListener.java
@@ -45,6 +45,7 @@
        Assert.hasKeyAndValue(reqJson, "curDegrees", "请求报文中未包含curDegrees");
        Assert.hasKeyAndValue(reqJson, "preReadingTime", "请求报文中未包含preReadingTime");
        Assert.hasKeyAndValue(reqJson, "curReadingTime", "请求报文中未包含curReadingTime");
        Assert.hasKeyAndValue(reqJson, "objType", "请求报文中未包含objType");
        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
    }
@@ -65,7 +66,8 @@
        payFeePo.setStartTime(reqJson.getString("preReadingTime"));
        payFeePo.setEndTime(reqJson.getString("preReadingTime"));
        payFeePo.setPayerObjId(reqJson.getString("objId"));
        payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
        //payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
        payFeePo.setPayerObjType(reqJson.getString("objType"));
        payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
        payFeePo.setState(FeeDto.STATE_DOING);
        payFeePo.setUserId(context.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));