修复bug

fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/AuditStatus.java

@@ -10,6 +10,7 @@ public enum AuditStatus {
     WAITING_AUDIT(0 , "待集团审核"),
     AUDITED(1 , "已审核"),
     SHOOT_AUDIT(2 , "待地区审核"),
+    REGION_AUDITED(3 , "地区审核通过"),
     REGION_REJECT(-4 , "地区审核未通过"),
     REJECT(-1 , "集团审核不通过"),
     ;

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

@@ -24,9 +24,9 @@ public class TmAuditLogServiceImpl extends ServiceImpl<TmAuditLogDao, TmAuditLog
         LambdaQueryWrapper<TmAuditLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.ne(TmAuditLog::getAuditStatus , AuditStatus.WAITING_AUDIT.getCode());
         lambdaQueryWrapper.ne(TmAuditLog::getAuditStatus , AuditStatus.SHOOT_AUDIT.getCode());
-        if(StringUtils.isNotBlank(houseId)){
-            lambdaQueryWrapper.eq(TmAuditLog::getVrId , houseId);
-        }
+        lambdaQueryWrapper.eq(TmAuditLog::getVrId , houseId);
+
+        lambdaQueryWrapper.or(wrapper -> wrapper.eq(TmAuditLog::getAuditType, 0).eq(TmAuditLog::getVrId , houseId));
         lambdaQueryWrapper.orderByDesc(TmAuditLog::getAuditTime);
         return getBaseMapper().selectPage(page , lambdaQueryWrapper);
     }

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

@@ -91,7 +91,11 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
             }
         }
         if (null != status) {
-            lambdaQueryWrapper.eq(TmHouse::getStatus, status);
+            if(status.compareTo(HouseStatus.REJECT.getCode()) == 0){
+                lambdaQueryWrapper.in(TmHouse::getStatus, HouseStatus.REJECT.getCode(), HouseStatus.REGION_REJECT.getCode());
+            }else {
+                lambdaQueryWrapper.eq(TmHouse::getStatus, status);
+            }
         }
         if (null != type) {
             lambdaQueryWrapper.eq(TmHouse::getType, type);
@@ -216,10 +220,10 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
             lambdaQueryWrapper.eq(TmHouse::getType, type);
         }
         if(StringUtils.isNotBlank(startTime)){
-            lambdaQueryWrapper.ge(TmHouse::getAuditTime, startTime);
+            lambdaQueryWrapper.ge(TmHouse::getSubmitAuditTime, startTime);
         }
         if(StringUtils.isNotBlank(startTime)){
-            lambdaQueryWrapper.le(TmHouse::getAuditTime, endTime);
+            lambdaQueryWrapper.le(TmHouse::getSubmitAuditTime, endTime);
         }
         IPage<TmHouse> page = new Page<>(pageNum, pageSize, true);
         IPage<TmHouse> resultPage = getBaseMapper().selectPage(page, lambdaQueryWrapper);
@@ -301,10 +305,10 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
             lambdaQueryWrapper.eq(TmHouse::getType, type);
         }
         if(StringUtils.isNotBlank(startTime)){
-            lambdaQueryWrapper.ge(TmHouse::getAuditTime, startTime);
+            lambdaQueryWrapper.ge(TmHouse::getSubmitAuditTime, startTime);
         }
         if(StringUtils.isNotBlank(startTime)){
-            lambdaQueryWrapper.le(TmHouse::getAuditTime, endTime);
+            lambdaQueryWrapper.le(TmHouse::getSubmitAuditTime, endTime);
         }
         List<TmHouse> tmHouseList = getBaseMapper().selectList(lambdaQueryWrapper);
 

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

@@ -165,7 +165,7 @@ public class AuditController extends BaseController{
         if(AuditStatus.AUDITED.getCode().compareTo(auditRequestBean.getAuditStatus()) == 0){
             if(AuditStatus.SHOOT_AUDIT.getCode().compareTo(tmAudit.getAuditStatus().intValue()) == 0){
                 tmAudit.setAuditStatus(AuditStatus.WAITING_AUDIT.getCode());
-                tmAuditLog.setAuditStatus(AuditStatus.WAITING_AUDIT.getCode());
+                tmAuditLog.setAuditStatus(AuditStatus.REGION_AUDITED.getCode());
                 //地区审核通过，修改成待集团审核
                 dbHouse.setStatus(HouseStatus.WAITING_AUDIT.getCode());