完成，要联调

fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmEstateServiceImpl.java

@@ -119,6 +119,9 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
 
         String date = DateUtil.date2String(new Date(), DateUtil.YYYYMMDDHHMMSS_DATA_FORMAT);
 
+        if (queryHouseParam.getStatus() == null) {
+            queryHouseParam.setStatus(HouseStatus.ALL.getCode());
+        }
         String aduitName = HouseStatus.get(queryHouseParam.getStatus()).getDesc();
         if(queryHouseParam.getStatus().compareTo(HouseStatus.REJECT.getCode()) == 0){
             aduitName = "未通过";

fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/ExcelUtil.java

@@ -21,7 +21,7 @@ public class ExcelUtil {
     private List<String> coleNames;
 
     public ExcelUtil(List<String> coleNames) {
-        if (!CollectionUtils.isEmpty(coleNames)) {
+        if (CollectionUtils.isEmpty(coleNames)) {
             throw new RuntimeException("导出列名称集合为空");
         }
         this.coleNames = coleNames;

fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -21,10 +21,7 @@ import fdage.back.sdk.base.enums.ResultCodeEnum;
 import fdage.back.sdk.base.exception.CommonBaseException;
 import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
 import fdage.back.sdk.core.alibabaUtils.AlibabaOssHelper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -531,7 +528,9 @@ public class HouseManagerController extends BaseController{
 
     @PostMapping("/deleteHouse")
     @ApiOperation(value = "删除房源信息")
-    public ViewResult deleteHouse(@NotBlank(message = "楼盘id不能为空") @RequestParam("楼盘id") String estateId){
+    public ViewResult deleteHouse(@ApiParam(name="estateId", value = "楼盘id")
+                                      @NotBlank(message = "楼盘id不能为空")
+                                      @RequestParam("estateId") String estateId){
         String msg = tmEstateService.delete(estateId, getContextUserInfo(), getToken());
         return ViewResult.success(msg);
     }

fcb-project-manager-core/src/main/resources/mybatis/mappers/TmEstateMapper.xml

@@ -76,6 +76,6 @@
                 #{status}
             </foreach>
         </if>
-        order by estate.create_time desc
+        order by house.create_time desc
     </sql>
 </mapper>