huanghongfa
2021-04-02 f0e7a764e298656aa298c32831d596223d8f201c
修改bug
3个文件已修改
10 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComOpsHouseDTO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComOpsHouseDTO.java
@@ -42,7 +42,7 @@
    @ApiModelProperty(value = "发布人id")
    private Long userId;
    @ApiModelProperty(value = "状态  0待审核 1已上架 2已驳回 3已下架 4待审核和已驳回")
    @ApiModelProperty(value = "状态  0待审核 1已上架 2已驳回 3已下架 4待审核和已驳回 5已上架和已下架")
    private Integer status;
    @ApiModelProperty("小程序使用 1 表示查询我的")
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java
@@ -56,6 +56,9 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("房屋租售id主键不能为空");
        }
        if(comOpsHouseVO.getReason().isEmpty()){
            return R.fail("请填写驳回原因");
        }
        return communityService.putOpsHouse(comOpsHouseVO);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
@@ -61,12 +61,15 @@
            "<if test='pageComOpsHouseDTO.houseCommunityId != null '>" +
            "AND d.house_community_id=#{pageComOpsHouseDTO.houseCommunityId} \n" +
            " </if> " +
            "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status !=4 '>" +
            "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status &lt; 4 '>" +
            "AND d.status=#{pageComOpsHouseDTO.status} \n" +
            " </if> " +
            "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status ==4 '>" +
            "AND d.status in (0,2) \n" +
            " </if> " +
            "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status ==5 '>" +
            "AND d.status in (1,3) \n" +
            " </if> " +
            "<if test='pageComOpsHouseDTO.houseCommunityName != null and pageComOpsHouseDTO.houseCommunityName.trim() != &quot;&quot;'>" +
            " and d.`house_community_name` LIKE concat( #{pageComOpsHouseDTO.houseCommunityName}, '%' ) \n" +
            " </if> " +