Commit 97c85edc9794bdc5d49821c611aaeccf9ea86f7e

Authored by pengcheng
1 parent 41c369e5

模糊查询

src/main/java/com/huaheng/pc/config/bom/controller/BomHeaderController.java
@@ -72,7 +72,7 @@ public class BomHeaderController extends BaseController { @@ -72,7 +72,7 @@ public class BomHeaderController extends BaseController {
72 lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), BomHeader::getCreated, createdBegin) 72 lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), BomHeader::getCreated, createdBegin)
73 .lt(StringUtils.isNotEmpty(createdEnd), BomHeader::getCreated, createdEnd) 73 .lt(StringUtils.isNotEmpty(createdEnd), BomHeader::getCreated, createdEnd)
74 .eq(StringUtils.isNotEmpty(bomHeader.getMaterialCode()), BomHeader::getMaterialCode, bomHeader.getMaterialCode()) 74 .eq(StringUtils.isNotEmpty(bomHeader.getMaterialCode()), BomHeader::getMaterialCode, bomHeader.getMaterialCode())
75 - .eq(StringUtils.isNotEmpty(bomHeader.getMaterialName()), BomHeader::getMaterialName, bomHeader.getMaterialName()) 75 + .like(StringUtils.isNotEmpty(bomHeader.getMaterialName()), BomHeader::getMaterialName, bomHeader.getMaterialName())
76 .eq(StringUtils.isNotEmpty(bomHeader.getCompanyCode()), BomHeader::getCompanyCode, bomHeader.getCompanyCode()); 76 .eq(StringUtils.isNotEmpty(bomHeader.getCompanyCode()), BomHeader::getCompanyCode, bomHeader.getCompanyCode());
77 77
78 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ 78 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
src/main/java/com/huaheng/pc/config/excelTemplate/controller/excelTemplateController.java
@@ -59,7 +59,7 @@ public class excelTemplateController extends BaseController { @@ -59,7 +59,7 @@ public class excelTemplateController extends BaseController {
59 Integer pageSize = pageDomain.getPageSize(); 59 Integer pageSize = pageDomain.getPageSize();
60 lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), ExcelTemplate::getCreated, createdBegin) 60 lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), ExcelTemplate::getCreated, createdBegin)
61 .lt(StringUtils.isNotEmpty(createdEnd), ExcelTemplate::getCreated, createdEnd) 61 .lt(StringUtils.isNotEmpty(createdEnd), ExcelTemplate::getCreated, createdEnd)
62 - .eq(StringUtils.isNotEmpty(excelTemplate.getName()), ExcelTemplate::getName, excelTemplate.getName()) 62 + .like(StringUtils.isNotEmpty(excelTemplate.getName()), ExcelTemplate::getName, excelTemplate.getName())
63 .eq(ExcelTemplate::getWarehouseCode, ShiroUtils.getWarehouseCode()) 63 .eq(ExcelTemplate::getWarehouseCode, ShiroUtils.getWarehouseCode())
64 .in(ExcelTemplate::getCompanyCode, ShiroUtils.getCompanyCodeList()); 64 .in(ExcelTemplate::getCompanyCode, ShiroUtils.getCompanyCodeList());
65 65
src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java
@@ -64,7 +64,7 @@ public class MaterialMultipleController extends BaseController { @@ -64,7 +64,7 @@ public class MaterialMultipleController extends BaseController {
64 lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), MaterialMultiple::getCreated, createdBegin) 64 lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), MaterialMultiple::getCreated, createdBegin)
65 .lt(StringUtils.isNotEmpty(createdEnd), MaterialMultiple::getCreated, createdEnd) 65 .lt(StringUtils.isNotEmpty(createdEnd), MaterialMultiple::getCreated, createdEnd)
66 .eq(StringUtils.isNotEmpty(materialMultiple.getMaterialCode()), MaterialMultiple::getMaterialCode, materialMultiple.getMaterialCode()) 66 .eq(StringUtils.isNotEmpty(materialMultiple.getMaterialCode()), MaterialMultiple::getMaterialCode, materialMultiple.getMaterialCode())
67 - .eq(StringUtils.isNotEmpty(materialMultiple.getMaterialName()), MaterialMultiple::getMaterialName, materialMultiple.getMaterialName()) 67 + .like(StringUtils.isNotEmpty(materialMultiple.getMaterialName()), MaterialMultiple::getMaterialName, materialMultiple.getMaterialName())
68 .in(MaterialMultiple::getCompanyCode, ShiroUtils.getCompanyCodeList()) 68 .in(MaterialMultiple::getCompanyCode, ShiroUtils.getCompanyCodeList())
69 .eq(MaterialMultiple::getWarehouseCode, ShiroUtils.getWarehouseCode()); 69 .eq(MaterialMultiple::getWarehouseCode, ShiroUtils.getWarehouseCode());
70 70