`fix`

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/controller/SiteBagController.java

@@ -28,7 +28,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
  * @author Lion Li
  * @date 2024-10-31
  */
-@Validated
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/bag")

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/SiteBag.java

@@ -59,7 +59,7 @@ public class SiteBag implements Serializable {
     /**
      * 层号
      */
-    private String bagLocal2;
+//    private String bagLocal2;
 
     /**
      * 入库时间，停用

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/SiteBagBo.java

@@ -25,74 +25,74 @@ public class SiteBagBo extends BaseEntity {
     /**
      * id
      */
-    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "id不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 快递公司
      */
-    @NotBlank(message = "快递公司不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "快递公司不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bagCompany;
 
     /**
      * 快递单号
      */
-    @NotBlank(message = "快递单号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "快递单号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bagNumber;
 
     /**
      * 出库状态,待取件0，出库1，异常2，异常已处理3
      */
-    @NotBlank(message = "出库状态,待取件0，出库1，异常2，异常已处理3不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "出库状态,待取件0，出库1，异常2，异常已处理3不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bagStatus;
 
     /**
      * 出库时间
      */
-    @NotNull(message = "出库时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "出库时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date bagOutTime;
 
     /**
      * 货架号
      */
-    @NotBlank(message = "货架号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "货架号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bagLocal;
 
     /**
      * 层号
      */
-    @NotBlank(message = "层号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "层号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bagLocal2;
 
     /**
      * 入库时间，停用
      */
-    @NotNull(message = "入库时间，停用不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "入库时间，停用不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date bagInTime;
 
     /**
      * 异常原因，如退件、损坏等
      */
-    @NotBlank(message = "异常原因，如退件、损坏等不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "异常原因，如退件、损坏等不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bagReason;
 
     /**
      * 所在站点
      */
-    @NotBlank(message = "所在站点不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "所在站点不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bagSite;
 
     /**
      * 修改时间
      */
-    @NotNull(message = "修改时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "修改时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date updatedAt;
 
     /**
      * 创建时间，入库时间
      */
-    @NotNull(message = "创建时间，入库时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date createdAt;
+//    @NotNull(message = "创建时间，入库时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date createdAt; 
 
 
 }

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/SiteBagServiceImpl.java

@@ -66,12 +66,15 @@ public class SiteBagServiceImpl implements ISiteBagService {
         lqw.eq(StringUtils.isNotBlank(bo.getBagStatus()), SiteBag::getBagStatus, bo.getBagStatus());
         lqw.eq(bo.getBagOutTime() != null, SiteBag::getBagOutTime, bo.getBagOutTime());
         lqw.eq(StringUtils.isNotBlank(bo.getBagLocal()), SiteBag::getBagLocal, bo.getBagLocal());
-        lqw.eq(StringUtils.isNotBlank(bo.getBagLocal2()), SiteBag::getBagLocal2, bo.getBagLocal2());
+//        lqw.eq(StringUtils.isNotBlank(bo.getBagLocal2()), SiteBag::getBagLocal2, bo.getBagLocal2());
         lqw.eq(bo.getBagInTime() != null, SiteBag::getBagInTime, bo.getBagInTime());
         lqw.eq(StringUtils.isNotBlank(bo.getBagReason()), SiteBag::getBagReason, bo.getBagReason());
         lqw.eq(StringUtils.isNotBlank(bo.getBagSite()), SiteBag::getBagSite, bo.getBagSite());
         lqw.eq(bo.getUpdatedAt() != null, SiteBag::getUpdatedAt, bo.getUpdatedAt());
         lqw.eq(bo.getCreatedAt() != null, SiteBag::getCreatedAt, bo.getCreatedAt());
+        if(params.containsKey("createdAt")){
+            lqw.between(SiteBag::getCreatedAt, (String) params.get("beginCreatedAt"), (String) params.get("endCreatedAt"));
+        }
         return lqw;
     }