andrew 4 年之前
父節點
當前提交
807af9148f

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

369
                                     HttpServletRequest request){
369
                                     HttpServletRequest request){
370
 
370
 
371
         ResponseBean responseBean = new ResponseBean();
371
         ResponseBean responseBean = new ResponseBean();
372
-        TaUser userElement = getTaUser(request);
373
-        responseBean = iBuildingOwnerInfoService.hasBuild(userElement, orgId ,phaseId, buildingId, unitId, levelId, roomNoId);
372
+        String personId = getPersonId(request);
373
+        responseBean = iBuildingOwnerInfoService.hasBuild(personId, orgId ,phaseId, buildingId, unitId, levelId, roomNoId);
374
         return responseBean;
374
         return responseBean;
375
     }
375
     }
376
 
376
 

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

109
      * @param verifyStatus
109
      * @param verifyStatus
110
      * @return
110
      * @return
111
      */
111
      */
112
-    List<TaUserVerify> selectWxCommunityAndAddress(@Param("userId") Integer userId,
112
+    List<TaUserVerify> selectWxCommunityAndAddress(@Param("personId") String personId,
113
                                                  @Param("orgId") Integer orgId,
113
                                                  @Param("orgId") Integer orgId,
114
                                                  @Param("phaseId") Integer phaseId,
114
                                                  @Param("phaseId") Integer phaseId,
115
                                                  @Param("buildingId") Integer buildingId,
115
                                                  @Param("buildingId") Integer buildingId,

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

180
      * @param roomNoId
180
      * @param roomNoId
181
      * @return
181
      * @return
182
      */
182
      */
183
-    ResponseBean hasBuild(TaUser userElement, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
183
+    ResponseBean hasBuild(String personId, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
184
 }
184
 }

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

1202
     }
1202
     }
1203
 
1203
 
1204
     @Override
1204
     @Override
1205
-    public ResponseBean hasBuild(TaUser userElement, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
1205
+    public ResponseBean hasBuild(String personId, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
1206
         ResponseBean responseBean = new ResponseBean();
1206
         ResponseBean responseBean = new ResponseBean();
1207
         // 1.检验该用户关联有没有这个 户号,审核通过的
1207
         // 1.检验该用户关联有没有这个 户号,审核通过的
1208
-        List<TaUserVerify> taUserVerifyEqVerifyStatus1 = taUserVerifyMapper.selectWxCommunityAndAddress(userElement.getUserId(),userElement.getOrgId(), phaseId, buildingId, unitId, levelId, roomNoId, 1);
1208
+        List<TaUserVerify> taUserVerifyEqVerifyStatus1 = taUserVerifyMapper.selectWxCommunityAndAddress(personId,1, phaseId, buildingId, unitId, levelId, roomNoId, 1);
1209
         // List<TaUserVerify> taUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
1209
         // List<TaUserVerify> taUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
1210
         if (null != taUserVerifyEqVerifyStatus1 && taUserVerifyEqVerifyStatus1.size() > 0) {
1210
         if (null != taUserVerifyEqVerifyStatus1 && taUserVerifyEqVerifyStatus1.size() > 0) {
1211
             responseBean.addError("你已关联此房间,无法再次关联!");
1211
             responseBean.addError("你已关联此房间,无法再次关联!");
1213
         }
1213
         }
1214
 
1214
 
1215
         // 1.检验该用户关联有没有这个 户号,待审核
1215
         // 1.检验该用户关联有没有这个 户号,待审核
1216
-        List<TaUserVerify> taUserVerifyEqVerifyStatus0 = taUserVerifyMapper.selectWxCommunityAndAddress(userElement.getUserId(),userElement.getOrgId(), phaseId, buildingId, unitId, levelId, roomNoId, 0);
1216
+        List<TaUserVerify> taUserVerifyEqVerifyStatus0 = taUserVerifyMapper.selectWxCommunityAndAddress(personId,1, phaseId, buildingId, unitId, levelId, roomNoId, 0);
1217
         if (null != taUserVerifyEqVerifyStatus0 && taUserVerifyEqVerifyStatus0.size() > 0) {
1217
         if (null != taUserVerifyEqVerifyStatus0 && taUserVerifyEqVerifyStatus0.size() > 0) {
1218
             responseBean.addError("您已提交了这个房产的审核!请等待户主或者物业审核后,再进行下一步操作!");
1218
             responseBean.addError("您已提交了这个房产的审核!请等待户主或者物业审核后,再进行下一步操作!");
1219
             return responseBean;
1219
             return responseBean;

+ 4
- 4
src/main/resources/mapper/property/TaUserVerifyMapper.xml 查看文件

3
 <mapper namespace="com.huiju.estateagents.property.dao.TaUserVerifyMapper">
3
 <mapper namespace="com.huiju.estateagents.property.dao.TaUserVerifyMapper">
4
 
4
 
5
     <sql id="Base_Column_List" >
5
     <sql id="Base_Column_List" >
6
-    id, user_id, org_id, role_id, phase_id, phase_name, building_id, building_name,
6
+    id, person_id, org_id, role_id, phase_id, phase_name, building_id, building_name,
7
     unit_id, unit_name, level_id, level_name, room_no_id, room_no_name, verify_status,
7
     unit_id, unit_name, level_id, level_name, room_no_id, room_no_name, verify_status,
8
     create_date, verify_name, remark
8
     create_date, verify_name, remark
9
   </sql>
9
   </sql>
58
         and level_id = #{levelId,jdbcType=INTEGER}
58
         and level_id = #{levelId,jdbcType=INTEGER}
59
         and room_no_id = #{roomNoId,jdbcType=INTEGER}
59
         and room_no_id = #{roomNoId,jdbcType=INTEGER}
60
         and verify_status = 1
60
         and verify_status = 1
61
-        and user_id = #{userId}
61
+        and person_id = #{userId}
62
         and role_id = #{roleId}
62
         and role_id = #{roleId}
63
     </select>
63
     </select>
64
 
64
 
67
           *
67
           *
68
         from ta_user_verify
68
         from ta_user_verify
69
         where org_id = #{orgId,jdbcType=INTEGER}
69
         where org_id = #{orgId,jdbcType=INTEGER}
70
-        and user_id = #{userId,jdbcType=INTEGER}
70
+        and person_id = #{userId,jdbcType=INTEGER}
71
         and phase_id = #{phaseId,jdbcType=INTEGER}
71
         and phase_id = #{phaseId,jdbcType=INTEGER}
72
         and building_id = #{buildingId,jdbcType=INTEGER}
72
         and building_id = #{buildingId,jdbcType=INTEGER}
73
         and unit_id = #{unitId,jdbcType=INTEGER}
73
         and unit_id = #{unitId,jdbcType=INTEGER}
83
         <include refid="Base_Column_List"/>
83
         <include refid="Base_Column_List"/>
84
         from ta_user_verify
84
         from ta_user_verify
85
         where org_id = #{orgId,jdbcType=INTEGER}
85
         where org_id = #{orgId,jdbcType=INTEGER}
86
-        and user_id = #{userId,jdbcType=INTEGER}
86
+        and person_id = #{personId,jdbcType=INTEGER}
87
         and phase_id = #{phaseId,jdbcType=INTEGER}
87
         and phase_id = #{phaseId,jdbcType=INTEGER}
88
         and building_id = #{buildingId,jdbcType=INTEGER}
88
         and building_id = #{buildingId,jdbcType=INTEGER}
89
         and unit_id = #{unitId,jdbcType=INTEGER}
89
         and unit_id = #{unitId,jdbcType=INTEGER}