更新教职工工资搜索

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/pay/XiaoyuanPayServiceImpl.java

@@ -1,16 +1,14 @@
 package org.dromara.system.service.impl.pay;
 
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson2.JSONArray;
+
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonArray;
+
 import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
+
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
@@ -22,9 +20,8 @@ import org.dromara.system.mapper.pay.XiaoyuanPayMapper;
 import org.dromara.system.service.impl.SysDictTypeServiceImpl;
 import org.dromara.system.service.pay.IXiaoyuanPayService;
 import org.springframework.stereotype.Service;
-
 import java.util.*;
-import java.util.stream.Collectors;
+
 
 /**
  * 教职工工资条Service业务层处理
@@ -115,6 +112,8 @@ public class XiaoyuanPayServiceImpl implements IXiaoyuanPayService {
         lqw.eq(StringUtils.isNotBlank(bo.getTableHead()), XiaoyuanPay::getTableHead, bo.getTableHead());
         lqw.eq(StringUtils.isNotBlank(bo.getTableDetail()), XiaoyuanPay::getTableDetail, bo.getTableDetail());
         lqw.eq(StringUtils.isNotBlank(bo.getPayTime()), XiaoyuanPay::getPayTime, bo.getPayTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getYear()), XiaoyuanPay::getYear, bo.getYear());
+        lqw.eq(StringUtils.isNotBlank(bo.getMonth()), XiaoyuanPay::getMonth, bo.getMonth());
         return lqw;
     }