房屋管理

huanghongfa

2021-01-18 63092ae674955a07c49ac9635946edb49bb7328a

房屋管理

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,18 +24,8 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -413,7 +403,7 @@
      <workItem from="1610859280054" duration="1991000" />
      <workItem from="1610930834137" duration="517000" />
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="5619000" />
      <workItem from="1610939265133" duration="6575000" />
    </task>
    <servers />
  </component>
@@ -465,54 +455,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="439" key="GridCell.Tab.0.bottom" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.0.bottom" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.0.center" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state width="1031" height="439" key="GridCell.Tab.0.center" timestamp="1610954587965">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.0.left" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610954587965" />
    <state width="1031" height="439" key="GridCell.Tab.0.left" timestamp="1610954587964">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.0.right" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610954587964" />
    <state width="1031" height="439" key="GridCell.Tab.0.right" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.1.bottom" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state width="1031" height="439" key="GridCell.Tab.1.bottom" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.1.center" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state width="1031" height="439" key="GridCell.Tab.1.center" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.1.left" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state width="1031" height="439" key="GridCell.Tab.1.left" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.1.right" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state width="1031" height="439" key="GridCell.Tab.1.right" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.2.bottom" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state width="1031" height="439" key="GridCell.Tab.2.bottom" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.2.center" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state width="1031" height="439" key="GridCell.Tab.2.center" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.2.left" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state width="1031" height="439" key="GridCell.Tab.2.left" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.2.right" timestamp="1610953681270">
    <state width="1031" height="439" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state width="1031" height="439" key="GridCell.Tab.2.right" timestamp="1610954587966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="439" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610954587966" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -533,10 +523,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1610939578806" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610949611764">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610953760887">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610949611764" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610953760887" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.java

@@ -13,7 +13,7 @@
 * @create: 2020-12-14 17:22
 **/
@Data
@ApiModel("其他建筑")
@ApiModel("其他建筑-入参")
public class ComMngStructOtherBuildVO {

    @ApiModelProperty("自增id")
@@ -48,4 +48,7 @@

    @ApiModelProperty("建筑类型名字")
    private String buileTypeName;

    @ApiModelProperty("社区id")
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -221,8 +221,9 @@
    }

    @ApiOperation(value = "分页查询其他建筑",response = ComMngStructOtherBuildVO.class)
    @GetMapping("pageotherbuild")
    @PostMapping("pageotherbuild")
    public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
        comMngStructOtherBuildVO.setCommunityId(this.getCommunityId());
        return communityService.pageOtherBuild(comMngStructOtherBuildVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java

@@ -45,7 +45,7 @@
            "join com_mng_struct_build_type t on b.type_id=t.id\n" +
            " <where>" +
            "<if test='comMngStructOtherBuildVO.name != null and comMngStructOtherBuildVO.name.trim() != &quot;&quot;'>" +
            "b.name = #{comMngStructOtherBuildVO.name}"+
            "b.name like concat(#{comMngStructOtherBuildVO.name},'%') "+
            " </if> " +
            " </where>" +
            "</script>")