springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -3,7 +3,6 @@ import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.dtos.community.PageVolunteerDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; @@ -40,10 +39,12 @@ @Resource private UserService userService; @ApiOperation(value = "分页查询社区",response = ComActVO.class) @PostMapping("pagecommunity") public R pageCommunity(@RequestBody PageComActDTO pageComActDTO){ return communityService.pageCommunity(pageComActDTO); @ApiOperation(value = "分页查询小区",response =ComMngStructAreaVO.class ) @PostMapping("pagearea") public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){ Long communityId = this.getCommunityId(); comMngStructAreaVO.setCommunityId(communityId); return communityService.pageArea(comMngStructAreaVO); } @ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class) springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
@@ -48,6 +48,7 @@ Long communityId = loginUserInfo.getCommunityId(); comOpsHouseDTO.setUserId(userId); comOpsHouseDTO.setCommunityId(communityId); comOpsHouseDTO.setUserType(1); return communityService.addOpsHouse(comOpsHouseDTO); }
@@ -7,6 +7,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngStructAreaDistrictVO; import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; @@ -32,6 +33,15 @@ private CommunityService communityService; @Resource private UserService userService; @ApiOperation(value = "分页查询小区",response = ComMngStructAreaVO.class ) @PostMapping("pagearea") public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){ Long communityId = this.getCommunityId(); comMngStructAreaVO.setCommunityId(communityId); return communityService.pageArea(comMngStructAreaVO); } // /** // * 攀枝花地址json // */ springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/HouseApi.java
@@ -39,6 +39,7 @@ Long communityId = loginUserInfo.getCommunityId(); comOpsHouseDTO.setUserId(userId); comOpsHouseDTO.setCommunityId(communityId); comOpsHouseDTO.setUserType(2); return communityService.addOpsHouse(comOpsHouseDTO); }
@@ -122,5 +122,8 @@ @ApiModelProperty(value = "社区主键",hidden = true) private Long communityId; @ApiModelProperty(value="用户类型 1 小程序 2 运营平台 3 社区平台",hidden = true) private Integer userType; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComOpsHouseDTO.java
@@ -22,10 +22,10 @@ @ApiModelProperty(value = "分页-每页记录数",example = "10") private Long pageSize; @ApiModelProperty(value="房屋所在社区id") @ApiModelProperty(value="房屋所在小区id") private Long houseCommunityId; @ApiModelProperty(value="房屋所在社区名字") @ApiModelProperty(value="房屋所在小区名字") private String houseCommunityName; @ApiModelProperty(value = "社区id",hidden = true) @@ -42,7 +42,7 @@ @ApiModelProperty(value = "发布人id") private Long userId; @ApiModelProperty(value = "状态 0待审核 1已上架 2已驳回 3已下架") @ApiModelProperty(value = "状态 0待审核 1已上架 2已驳回 3已下架 4待审核和已驳回") private Integer status; @ApiModelProperty("小程序使用 1 表示查询我的") @@ -58,4 +58,10 @@ private Integer brn; @ApiModelProperty(value="1 价格从低到高 2 价格从高到底 ") private Integer priceOrder; @ApiModelProperty(value="发布人姓名") private String userRealName; @ApiModelProperty(value="联系方式") private String mobile; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java
@@ -39,6 +39,7 @@ Long communityId = loginUserInfo.getCommunityId(); comOpsHouseDTO.setUserId(userId); comOpsHouseDTO.setCommunityId(communityId); comOpsHouseDTO.setUserType(3); return communityService.addOpsHouse(comOpsHouseDTO); }
@@ -6,7 +6,6 @@ import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.community.ComOpsHouseVO; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.service_community.model.dos.ComOpsHouseDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -20,15 +19,16 @@ **/ @Mapper public interface ComOpsHouseDAO extends BaseMapper<ComOpsHouseDO> { @Select("select name,address from com_act where community_id=#{communityId}") ComActVO selectCommunity(Long communityId); @Select("select type,name,phone,image_url from sys_user where user_id=#{userId}") LoginUserInfoVO selectUserByUserId(Long userId); @Select("select user_id from sys_user where user_id=#{name} limit 1") Long selectUserIdByName(String name); @Select("<script> " + "SELECT d.*,\n" + "u.name userName\n" + "u.name userName,u.type as userType\n" + "FROM\n" + "com_ops_house d\n" + "JOIN sys_user u ON d.user_id = u.user_id\n" + @@ -38,6 +38,9 @@ " </if> " + "<if test='pageComOpsHouseDTO.userId != null '>" + "AND d.user_id=#{pageComOpsHouseDTO.userId} \n" + " </if> " + "<if test='pageComOpsHouseDTO.orient != null '>" + "AND d.orient=#{pageComOpsHouseDTO.orient} \n" + " </if> " + @@ -59,12 +62,18 @@ "<if test='pageComOpsHouseDTO.houseCommunityId != null '>" + "AND d.house_community_id=#{pageComOpsHouseDTO.houseCommunityId} \n" + " </if> " + "<if test='pageComOpsHouseDTO.status != null '>" + "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status !=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.houseCommunityName != null and pageComOpsHouseDTO.houseCommunityName.trim() != ""'>" + " and d.`house_community_name` LIKE concat( #{pageComOpsHouseDTO.houseCommunityName}, '%' ) \n" + " </if> " + "<if test='pageComOpsHouseDTO.mobile != null and pageComOpsHouseDTO.mobile.trim() != ""'>" + " and d.`mobile` LIKE concat( #{pageComOpsHouseDTO.mobile}, '%' ) \n" + " </if> " + "<if test='pageComOpsHouseDTO.begin != null '>" + "AND d.create_at BETWEEN #{pageComOpsHouseDTO.begin} \n" + "AND #{pageComOpsHouseDTO.end} \n" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
@@ -7,6 +7,7 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComOpsHouseVO; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.ComOpsHouseDAO; import com.panzhihua.service_community.model.dos.ComOpsHouseDO; import com.panzhihua.service_community.service.ComOpsHouseService; @@ -106,6 +107,13 @@ } page.setSize(pageSize); page.setCurrent(pageNum); if(!StringUtils.isEmpty(pageComOpsHouseDTO.getUserRealName())){ Long userId = comOpsHouseDAO.selectUserIdByName(pageComOpsHouseDTO.getUserRealName()); if (userId==null){ userId = -1L; } pageComOpsHouseDTO.setUserId(userId); } IPage<ComOpsHouseVO> iPage = comOpsHouseDAO.pageHouse(page, pageComOpsHouseDTO); return R.ok(iPage);
