分派配置审批

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/DispatchConfigApprovalServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 分派配置审批服务实现类
@@ -49,15 +50,24 @@ public class DispatchConfigApprovalServiceImpl extends EnBaseServiceImpl<Dispatc
             if (entity.getStatus() != null) {
                 queryWrapper.eq("STATUS", entity.getStatus());
             }
+            if (Objects.nonNull(entity.getApplicationTimeStart())) {
+                queryWrapper.ge("APPLICATION_TIME", entity.getApplicationTimeStart());
+            }
+            if (Objects.nonNull(entity.getApplicationTimeEnd())) {
+                queryWrapper.le("APPLICATION_TIME", entity.getApplicationTimeEnd());
+            }
+            if (StrUtil.isNotEmpty(entity.getRemark())) {
+                queryWrapper.like("REMARK", entity.getRemark());
+            }
         }
-        
+
         // 按创建时间降序
         queryWrapper.orderByDesc("CREATE_TIME");
 
         IPage<DispatchConfigApproval> pages = baseMapper.selectPage(
-                page,
+                page, queryWrapper
-            queryWrapper
         );
+
         return DispatchConfigApprovalWrapper.build().pageVO(pages);
     }