增加筛选项

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/weishi/admin/vo/InsureVo.java

@@ -3,6 +3,8 @@ package org.dromara.mall.controller.weishi.admin.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.mall.domain.weishi.Insure;
 
 import java.io.Serial;
@@ -181,6 +183,7 @@ public class InsureVo implements Serializable {
     /**
      * 创建部门
      */
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME)
     private Long createDept;
 
     /**

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/weishi/impl/InsureServiceImpl.java

@@ -88,6 +88,16 @@ public class InsureServiceImpl extends AbstractBaseService<InsureVo, InsureBo, I
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Insure::getStatus, bo.getStatus());
         lqw.eq(bo.getCreateDept() != null, Insure::getCreateDept, bo.getCreateDept());
         lqw.eq(bo.getOrderTime() != null, Insure::getOrderTime, bo.getOrderTime());
+        if (params != null) {
+            String startTime = params.getOrDefault("beginDate", StringUtils.EMPTY).toString();
+            if (StringUtils.isNotEmpty(startTime)) {
+                lqw.ge(Insure::getBeginDate, startTime);
+            }
+            String endTime = params.getOrDefault("endDate", StringUtils.EMPTY).toString();
+            if (StringUtils.isNotEmpty(endTime)) {
+                lqw.le(Insure::getEndDate, endTime);
+            }
+        }
         return lqw;
     }