diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java index e014d8a6..46774e5f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java @@ -336,7 +336,9 @@ public class BomReportApi extends BaseApi { @PostMapping("queryMaterial") @ApiOperation("物料查询") public ResultVO> materialQuery(@RequestBody MaterialQueryDTO queryParam){ - + if(StrUtil.isNotBlank(queryParam.getDrawingNo())){ + queryParam.setDrawingNo(StrUtil.replace(queryParam.getDrawingNo(),"*","")); + } Page page = new PageVO<>(queryParam.getPage(), queryParam.getPageSize()); Page result = materialMainService.getBaseMapper().queryMaterial(page , queryParam); //排序 diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml index 1ca74d19..c3fcec81 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml @@ -217,13 +217,13 @@ from t_material_main where 1=1 - and material_category_code = #{query.materialCategoryCode} + and material_category_code like concat( #{query.materialCategoryCode} ,'%') - and material_no like concat(#{query.materialNo},'%') + and material_no like concat('%', #{query.materialNo},'%') - and drawing_no like concat(#{query.drawingNo},'%') + and drawing_no like concat('%', #{query.drawingNo},'%') and material_desc like concat('%',#{query.materialDesc},'%')