修改bug

fdkanfang-dao/src/main/java/com/fdkanfang/dao/backend/provider/HouseProvider.java

@@ -20,6 +20,7 @@ public class HouseProvider {
         StringBuffer sql = new StringBuffer(
                 "SELECT z.id, z.num, z.address, z.district_name, z.unit_type, z.area, z.floor, z.orientation, z.status, " +
                         "z.requirement, z.handler, z.create_time, z.update_time, z.web_site, z.scene_code, " +
+                        "z.audit_result, z.can_not_edit, z.can_not_edit_desc, " +
                         "u.real_name as upload_name, c.real_name as handler_name FROM " +
                 "tb_house z left join tb_user u ON z.user_id = u.id left join tb_user c ON z.handler = c.id where z.rec_status = 'A' ");
         if(StrUtil.isNotBlank(searchKey)){
@@ -90,7 +91,7 @@ public class HouseProvider {
                 "SELECT house.id, house.num, house.address, house.district_name," +
                         " house.unit_type, house.area, house.floor, house.orientation, house.status, " +
                         "house.requirement, house.handler, house.create_time, house.update_time, house.web_site, house.scene_code, " +
-                        "house.audit_result, house.can_not_edit, house.can_not_edit_desc, " +
+                        "house.audit_desc,house.audit_result, house.can_not_edit, house.can_not_edit_desc, " +
                         "uploader.real_name as upload_name, handler.real_name as handler_name FROM " +
                         "tb_house house left join tb_user uploader " +
                         "ON  house.user_id = uploader.id left join tb_user handler " +
@@ -99,6 +100,7 @@ public class HouseProvider {
             sql.append(" and (");
             sql.append(" house.district_name like '%").append(searchKey).append("%'");
             sql.append(" or uploader.real_name like '%").append(searchKey).append("%'");
+            sql.append(" or house.num like '%").append(searchKey).append("%'");
             sql.append( ")");
         }
         if (null != handlerId) {

fdkanfang-domain/src/main/java/com/fdkanfang/domain/response/HouseResponse.java

@@ -63,6 +63,16 @@ public class HouseResponse {
     private String sceneCode;
 
 
+    // 预审结果： 1 通过 0 未通过
+    private Integer auditResult;
+
+    // 无法制作： 1 可以制作（默认） 0 不能制作
+    private Integer canNotEdit;
+
+    // 无法制作的原因描述
+    private String canNotEditDesc;
+
+
 
 
 

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/HouseController.java

@@ -98,7 +98,7 @@ public class HouseController extends BaseController {
 
                 PageInfo<HouseResponse> page = null;
         if (userRoles.contains("admin")) {
-            page =  new PageInfo<>(houseService2.findAllBySearchKey(param, null, null));
+            page =  new PageInfo<>(houseService2.findBySearchKeyForEditOrUploader(param, null, null));
         }  else if (userRoles.contains("edit")){
 
             if (userRoles.size() == 2) {