新增项目成本普通查询支持模糊查询

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.projectCostHuiji.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -10,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -128,7 +130,14 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 
         ProjectCostHuijiSumVO sumVO = new ProjectCostHuijiSumVO();
 
-        QueryWrapper<ProjectCostHuiji> queryWrapper = QueryGenerator.initQueryWrapper(projectCostHuiji, req.getParameterMap());
+        ProjectCostHuiji huiji1 = new ProjectCostHuiji();
+
+        QueryWrapper<ProjectCostHuiji> queryWrapper = QueryGenerator.initQueryWrapper(huiji1, req.getParameterMap());
+        queryWrapper.lambda().like(StringUtils.isNotBlank(projectCostHuiji.getTaskno()), ProjectCostHuiji::getTaskno, projectCostHuiji.getTaskno());
+        queryWrapper.lambda().like(StringUtils.isNotBlank(projectCostHuiji.getTaskname()), ProjectCostHuiji::getTaskname, projectCostHuiji.getTaskname());
+        queryWrapper.lambda().like(StringUtils.isNotBlank(projectCostHuiji.getJycs()), ProjectCostHuiji::getJycs, projectCostHuiji.getJycs());
+        queryWrapper.lambda().like(StringUtils.isNotBlank(projectCostHuiji.getZrbm()), ProjectCostHuiji::getZrbm, projectCostHuiji.getZrbm());
+
 
         //高级查询参数不等于"null"并且有查询条件（"[%5B%5D]" 高级查询无查询条件） 则返回true，获取满足查询条件的任务号
         //普通查询有查询条件则returnFlag()返回true，判断条件是ProjectCostHuiji对象有任意属性不为null
@@ -240,7 +249,12 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
         } else {
             ProjectCost projectCost = new ProjectCost();
             BeanUtils.copyProperties(projectCostHuiji, projectCost);
-            QueryWrapper<ProjectCost> query = QueryGenerator.initQueryWrapper(projectCost, req.getParameterMap());
+            ProjectCost projectCost1 = new ProjectCost();
+            QueryWrapper<ProjectCost> query = QueryGenerator.initQueryWrapper(projectCost1, req.getParameterMap());
+            query.lambda().like(StringUtils.isNotBlank(projectCostHuiji.getTaskno()), ProjectCost::getTaskno, projectCostHuiji.getTaskno());
+            query.lambda().like(StringUtils.isNotBlank(projectCostHuiji.getTaskname()), ProjectCost::getTaskname, projectCostHuiji.getTaskname());
+            query.lambda().like(StringUtils.isNotBlank(projectCostHuiji.getJycs()), ProjectCost::getJycs, projectCostHuiji.getJycs());
+            query.lambda().like(StringUtils.isNotBlank(projectCostHuiji.getZrbm()), ProjectCost::getZrbm, projectCostHuiji.getZrbm());
 
             //根据条件分页查询任务
             CompletableFuture<Page<ProjectCost>> pageCompletableFuture = CompletableFuture.supplyAsync(() -> {