Your Name 4 年之前
父節點
當前提交
b91967834a

+ 2
- 1
src/main/java/com/huiju/estateagents/property/controller/BuildingOwnerInfoController.java 查看文件

417
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层")
417
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层")
418
     })
418
     })
419
     public ResponseBean selectByAddress(@RequestParam("orgId") Integer orgId,
419
     public ResponseBean selectByAddress(@RequestParam("orgId") Integer orgId,
420
+                                        @RequestParam(value = "communityId") Integer communityId,
420
                                         @RequestParam(value = "phaseId", required = false) Integer phaseId,
421
                                         @RequestParam(value = "phaseId", required = false) Integer phaseId,
421
                                         @RequestParam(value = "buildingId",required = false) Integer buildingId,
422
                                         @RequestParam(value = "buildingId",required = false) Integer buildingId,
422
                                         @RequestParam(value = "unitId", required = false) Integer unitId,
423
                                         @RequestParam(value = "unitId", required = false) Integer unitId,
423
                                         @RequestParam(value = "levelId", required = false) Integer levelId) {
424
                                         @RequestParam(value = "levelId", required = false) Integer levelId) {
424
 
425
 
425
         ResponseBean responseBean = new ResponseBean();
426
         ResponseBean responseBean = new ResponseBean();
426
-        responseBean = iBuildingOwnerInfoService.selectBuildList(orgId, phaseId, buildingId, unitId, levelId);
427
+        responseBean = iBuildingOwnerInfoService.selectBuildList(orgId, communityId, phaseId, buildingId, unitId, levelId);
427
         return responseBean;
428
         return responseBean;
428
 
429
 
429
     }
430
     }

+ 2
- 2
src/main/java/com/huiju/estateagents/property/dao/TpPhaseMapper.java 查看文件

23
      * @return
23
      * @return
24
      */
24
      */
25
     @ResultType(TpPhase.class)
25
     @ResultType(TpPhase.class)
26
-    @Select("select * from tp_phase where org_id = #{orgId}")
27
-    List<TpPhase> selectByAddress(@Param("orgId") Integer orgId);
26
+    @Select("select * from tp_phase where org_id = #{orgId} and community_id= #{communityId}")
27
+    List<TpPhase> selectByAddress(@Param("orgId") Integer orgId, @Param("communityId")  Integer communityId);
28
 
28
 
29
     @Update("update tp_phase set `name` = #{name} where id = #{id}")
29
     @Update("update tp_phase set `name` = #{name} where id = #{id}")
30
     int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
30
     int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);

+ 2
- 1
src/main/java/com/huiju/estateagents/property/service/IBuildingOwnerInfoService.java 查看文件

4
 import com.huiju.estateagents.base.ResponseBean;
4
 import com.huiju.estateagents.base.ResponseBean;
5
 import com.huiju.estateagents.center.taUser.entity.TaUser;
5
 import com.huiju.estateagents.center.taUser.entity.TaUser;
6
 import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
6
 import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
7
+import io.swagger.models.auth.In;
7
 import org.springframework.web.multipart.MultipartFile;
8
 import org.springframework.web.multipart.MultipartFile;
8
 
9
 
9
 import java.util.List;
10
 import java.util.List;
172
      * @param levelId
173
      * @param levelId
173
      * @return
174
      * @return
174
      */
175
      */
175
-    ResponseBean selectBuildList(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
176
+    ResponseBean selectBuildList(Integer orgId, Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
176
 
177
 
177
     /**
178
     /**
178
      * 根据 小区/期/楼栋/单元/楼层/户号
179
      * 根据 小区/期/楼栋/单元/楼层/户号

+ 2
- 2
src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java 查看文件

1212
 
1212
 
1213
 
1213
 
1214
     @Override
1214
     @Override
1215
-    public ResponseBean selectBuildList(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId) {
1215
+    public ResponseBean selectBuildList(Integer orgId, Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId) {
1216
         ResponseBean responseBean = new ResponseBean();
1216
         ResponseBean responseBean = new ResponseBean();
1217
 
1217
 
1218
         // 查询 期 -> 栋 -> 单元 -> 楼层 -> 户号
1218
         // 查询 期 -> 栋 -> 单元 -> 楼层 -> 户号
1219
         if (null == phaseId && null == buildingId && null == unitId && null == levelId) {
1219
         if (null == phaseId && null == buildingId && null == unitId && null == levelId) {
1220
-            List<TpPhase> phaseList = tpPhaseMapper.selectByAddress(orgId);
1220
+            List<TpPhase> phaseList = tpPhaseMapper.selectByAddress(orgId, communityId);
1221
             responseBean.addSuccess(phaseList);
1221
             responseBean.addSuccess(phaseList);
1222
         } else if (null == buildingId && null == unitId && null == levelId) {
1222
         } else if (null == buildingId && null == unitId && null == levelId) {
1223
             List<TpBuilding> buildingList = tpBuildingMapper.selectByAddress(orgId, phaseId);
1223
             List<TpBuilding> buildingList = tpBuildingMapper.selectByAddress(orgId, phaseId);