feat: 支持创建日期和计划类型查询

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SysImplementPlanDTO.java

@@ -12,6 +12,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 执行计划dto
@@ -91,6 +92,11 @@ public final class SysImplementPlanDTO {
          */
         private String planName;
 
+        /**
+         * 服务计划类型
+         */
+        private UpmsType.ImplementPlanType planType;
+
         /**
          * 审核状态
          */
@@ -106,6 +112,11 @@ public final class SysImplementPlanDTO {
          */
         private LocalDate[] period;
 
+        /**
+         * 创建时间
+         */
+        private LocalDateTime[] createTime;
+
 
         @NotNull(message = "页码必填")
         @Min(value = 1, message = "页码最小为{value}")

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -124,7 +124,7 @@ public class SysImplementPlanManager {
 
         // 获取根目录分页
         Page<SysImplementPlan> page = this.getPage(operator, entLevel, query.getCurrent(), query.getSize(), query.getPlanName(),
-                query.getConsigneeId(), operator.getDeptId(), query.getPeriod());
+                query.getConsigneeId(), operator.getDeptId(), query.getPlanState(), query.getPlanType(), query.getPeriod(), query.getCreateTime());
 
         List<SysImplementPlan> records = page.getRecords();
 
@@ -247,11 +247,16 @@ public class SysImplementPlanManager {
                                            String planName,
                                            Integer consigneeId,
                                            Integer consignorId,
-                                           LocalDate[] period) {
+                                           UpmsState.ImplementPlanState planState,
+                                           UpmsType.ImplementPlanType planType,
+                                           LocalDate[] period,
+                                           LocalDateTime[] createTime) {
 
         LambdaQueryWrapper<SysImplementPlan> wrapper = Wrappers.<SysImplementPlan>lambdaQuery()
 //                .eq(Objects.nonNull(consigneeId), SysImplementPlan::getConsigneeId, consigneeId)
 //                .eq(Objects.nonNull(consignorId), SysImplementPlan::getConsignorId, consignorId)
+                .eq(Objects.nonNull(planType), SysImplementPlan::getPlanType, planType)
+                .eq(Objects.nonNull(planState), SysImplementPlan::getPlanState, planState)
                 .like(StrUtil.isNotBlank(planName), SysImplementPlan::getPlanName, planName);
 
         // 服务商管理员（只查询发给我的）
@@ -278,7 +283,12 @@ public class SysImplementPlanManager {
         }
 
         if (ArrayUtil.isNotEmpty(period) && period.length == 2) {
-            wrapper.between(SysImplementPlan::getCreateTime, period[0], period[1].plusMonths(1).minusDays(1));
+            wrapper.ge(SysImplementPlan::getPlanIssue, period[0]);
+            wrapper.le(SysImplementPlan::getPlanExpiry, period[1].plusMonths(1).minusDays(1));
+        }
+
+        if (ArrayUtil.isNotEmpty(createTime) && createTime.length == 2) {
+            wrapper.between(SysImplementPlan::getCreateTime, createTime[0], createTime[1].plusMonths(1).minusSeconds(1));
         }
 
         return implementPlanService.page(new Page<>(current, size), wrapper);