Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/DispatchConfigApprovalVO.java

@@ -1,5 +1,6 @@
 package org.springblade.desk.quality.pojo.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -53,6 +54,14 @@ public class DispatchConfigApprovalVO extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date applicationTime;
 
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applicationTimeStart;
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applicationTimeEnd;
+
+
     /**
      * 申请描述/备注
      */

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);
     }