修改bug

src/main/java/fcb/project/manager/base/entity/TmHouse.java

@@ -133,4 +133,13 @@ public class TmHouse implements Serializable {
     @ApiModelProperty(value = "所属公司名称")
     private String belongCompanyName;
 
+    @ApiModelProperty(value = "是否展示: 1->展示; 0->不展示")
+    private String isShow;
+
+
+    @ApiModelProperty(value = "提审时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime submitAuditTime;
+
 }

src/main/java/fcb/project/manager/base/enums/HouseStatus.java

@@ -10,7 +10,8 @@ public enum  HouseStatus {
       DRAFT(0 , "草稿"),
       WAITING_AUDIT(1 , "待审核"),
       AUDITED(2 , "已审核"),
-      REJECT(3 , "未通过"),
+      REJECT(-1 , "未通过"),
+      ALL(-2 , "所有状态"),
 
     ;
 

src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -36,6 +36,7 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
                                                String estateId , Long pageNum , Long pageSize){
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(TmHouse::getEstateId , estateId);
+        lambdaQueryWrapper.eq(TmHouse::getIsShow , 1);
         if(StringUtils.isNotBlank(houseTitle)){
             lambdaQueryWrapper.like(TmHouse::getHouseTitle , houseTitle);
         }
@@ -62,13 +63,19 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
     public IPage<TmHouse> getAuditHouseList(String houseTitle , Integer status, Integer type,
                                                 String belongCompany , String estateName , Long pageNum , Long pageSize){
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TmHouse::getIsShow , 1);
         if(StringUtils.isNotBlank(houseTitle)){
             lambdaQueryWrapper.like(TmHouse::getHouseTitle , houseTitle);
         }
         if(null != status){
-            lambdaQueryWrapper.eq(TmHouse::getStatus , status);
+            if(HouseStatus.ALL.getCode().compareTo(status) != 0){
+                lambdaQueryWrapper.eq(TmHouse::getStatus , status);
+            }else{
+                lambdaQueryWrapper.ne(TmHouse::getStatus , HouseStatus.DRAFT.getCode());
+            }
+            //捞取所有状态，默认不设置status的过滤条件
         }else{
-            lambdaQueryWrapper.ne(TmHouse::getStatus , HouseStatus.DRAFT.getCode());
+            lambdaQueryWrapper.eq(TmHouse::getStatus , HouseStatus.WAITING_AUDIT.getCode());
         }
         if(StringUtils.isNotBlank(estateName)){
             lambdaQueryWrapper.like(TmHouse::getEstateName , estateName);

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

@@ -8,6 +8,7 @@ import fcb.project.manager.base.entity.ContextTokenBean;
 import fcb.project.manager.base.entity.TmAudit;
 import fcb.project.manager.base.entity.TmEstate;
 import fcb.project.manager.base.entity.TmHouse;
+import fcb.project.manager.base.enums.AuditStatus;
 import fcb.project.manager.base.enums.HouseStatus;
 import fcb.project.manager.base.service.impl.TmAuditServiceImpl;
 import fcb.project.manager.base.service.impl.TmEstateServiceImpl;
@@ -439,6 +440,7 @@ public class HouseManagerController {
                 throw new CommonBaseException(ResultCodeEnum.D101 , "抢锁失败");
             }
             dbHouse.setAuditId(tmAudit.getId());
+            dbHouse.setSubmitAuditTime(LocalDateTime.now());
             dbHouse.setStatus(HouseStatus.WAITING_AUDIT.getCode());
             dbHouse.setUpdateTime(LocalDateTime.now());
             if(!tmHouseService.updateHouse(dbHouse)){
@@ -468,6 +470,9 @@ public class HouseManagerController {
         if(null == dbHouse || null == dbHouse.getAuditId()){
             return Result.failure("房源不存在或者未提交审核");
         }
+        if(HouseStatus.AUDITED.getCode().compareTo(dbHouse.getStatus()) != 0){
+            return Result.failure("房源状态非已审核");
+        }
 //        dbHouse = null;
         //抢房源的锁，去掉原来审核的
         dbHouse = tmHouseService.selectForUpdate(houseId);
@@ -479,6 +484,9 @@ public class HouseManagerController {
         if(null == tmAudit){
             return Result.failure("该房源未提交审核");
         }
+        if(AuditStatus.AUDITED.getCode().compareTo(tmAudit.getAuditStatus()) != 0){
+            return Result.failure("审核记录处于非审核通过的状态，无法撤销");
+        }
         //开启事务，抢审批记录的锁
         tmAudit = null;
         tmAudit = tmAuditService.selectForUpdate(dbHouse.getAuditId());
@@ -492,6 +500,7 @@ public class HouseManagerController {
         dbHouse.setAuditorId("");
         dbHouse.setAuditorName("");
         dbHouse.setAuditTime(null);
+        dbHouse.setStatus(HouseStatus.DRAFT.getCode());
         if(!tmHouseService.updateHouse(dbHouse)){
             throw new CommonBaseException(ResultCodeEnum.D101 , "撤销房源的审批记录失败");
         }