fix:1.提升项目号搜索的搜索范围,由模糊查询提成为可以中间填充模糊查询

chenhang4442024
1 parent adecd2bb
Showing 2 changed files with 12 additions and 3 deletions
src/main/java/com/order/erp/controller/OrderController.java
src/main/resources/mapper/OrderBaseInfoMapper.xml
@@ -140,12 +140,21 @@ public class OrderController {
     @ApiOperation("查询项目号或者内部编号")
     @PostMapping("/queryProjectNoAndInnerNo")
     public ServerResult queryProjectNoAndInnerNo(@RequestBody QueryProjectNoAndInnerNoDto dto) {
-        if (Objects.isNull(dto.getProjectNo()) && Objects.isNull(dto.getInnerNo())) {
+        if (dto.getProjectNo() == null && dto.getInnerNo() == null) {
             throw new BusinessException("请传入项目号或内部编号");
         }
-        return ServerResult.success(orderBaseInfoMapper.queryProjectNoAndInnerNoDto(dto.getInnerNo() == null ? Boolean.TRUE : Boolean.FALSE, dto));
+
+        boolean flag = dto.getProjectNo() != null;
+        if (flag && dto.getProjectNo().contains("-")) {
+            dto.setProjectNo(dto.getProjectNo().replace("-", "-.*"));
+        }
+
+        return ServerResult.success(
+                orderBaseInfoMapper.queryProjectNoAndInnerNoDto(flag, dto)
+        );
     }
  
+
     /**
      * 校验是否重复
      *
@@ -6,7 +6,7 @@
             SELECT DISTINCT project_no
             FROM order_base_info
             WHERE enable_flag = 10
-            AND project_no like concat('%',#{dto.projectNo},'%')
+            AND project_no REGEXP #{dto.projectNo}
         </if>
         <if test="flag == false">
             SELECT DISTINCT inner_no