修改代码，提供模糊查询项目号或者内部编号接口

Ran
1 parent 29ca27c2
Showing 4 changed files with 72 additions and 4 deletions
src/main/java/com/order/erp/controller/OrderController.java
src/main/java/com/order/erp/domain/vo/order/QueryProjectNoAndInnerNoDto.java
src/main/java/com/order/erp/mapper/order/OrderBaseInfoMapper.java
src/main/resources/mapper/OrderBaseInfoMapper.xml
@@ -3,13 +3,13 @@ package com.order.erp.controller;
 import com.order.erp.common.annotation.AnonymousAccess;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
-import com.order.erp.domain.vo.order.OrderAddVO;
-import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
-import com.order.erp.domain.vo.order.OrderUnlockFieldApplyVO;
-import com.order.erp.domain.vo.order.OrderUpdateVO;
+import com.order.erp.common.exception.BusinessException;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.mapper.order.OrderBaseInfoMapper;
 import com.order.erp.service.order.OrderBaseInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Objects;
  
 /**
  * 订单基础信息表(OrderBaseInfo)表控制层
@@ -36,6 +37,9 @@ public class OrderController {
     @Resource
     private OrderBaseInfoService orderBaseInfoService;
  
+    @Resource
+    private OrderBaseInfoMapper orderBaseInfoMapper;
+
     /**
      * 分页查询
      *
@@ -123,5 +127,21 @@ public class OrderController {
     public ServerResult deleteById(@RequestBody OrderBaseInfoQueryVO orderBaseInfoQueryVO) {
         return orderBaseInfoService.deleteById(orderBaseInfoQueryVO);
     }
+
+    /**
+     * @param dto
+     * @return ServerResult
+     * @Description: 查询项目号或者内部编号
+     * @Author wmr
+     * @CreateTime 2023/12/21 14:50
+     */
+    @ApiOperation("查询项目号或者内部编号")
+    @PostMapping("/queryProjectNoAndInnerNo")
+    public ServerResult queryProjectNoAndInnerNo(QueryProjectNoAndInnerNoDto dto) {
+        if (Objects.isNull(dto.getProjectNo()) && Objects.isNull(dto.getInnerNo())) {
+            throw new BusinessException("请传入项目号或内部编号");
+        }
+        return ServerResult.success(orderBaseInfoMapper.queryProjectNoAndInnerNoDto(dto.getInnerNo() == null ? Boolean.TRUE : Boolean.FALSE, dto));
+    }
 }
  
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * Date:2023/12/21
+ * Author：wmr
+ * Description:查询项目号和内部编号Dto类
+ */
+@ApiOperation("查询项目号和内部编号Dto类")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QueryProjectNoAndInnerNoDto implements Serializable {
+
+    @ApiModelProperty(value = "项目号")
+    private String projectNo;
+
+    @ApiModelProperty(value = "内部编号")
+    private String innerNo;
+}
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.order.erp.domain.OrderStatusEnum;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.vo.OrderCountVO;
+import com.order.erp.domain.vo.order.QueryProjectNoAndInnerNoDto;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
  
 import java.util.List;
@@ -26,5 +28,8 @@ public interface OrderBaseInfoMapper extends BaseMapper&lt;OrderBaseInfoDO&gt; {
  
     @Select("SELECT COUNT(*) as total_orders FROM order_base_info WHERE enable_flag=10 and YEAR(create_time) = YEAR(CURDATE())")
     long countRecentYear();
+
+    List<QueryProjectNoAndInnerNoDto> queryProjectNoAndInnerNoDto(@Param("flag") Boolean flag,
+                                                                  @Param("dto") QueryProjectNoAndInnerNoDto dto);
 }
  
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.order.erp.mapper.order.OrderBaseInfoMapper">
+    <select id="queryProjectNoAndInnerNoDto" resultType="com.order.erp.domain.vo.order.QueryProjectNoAndInnerNoDto">
+        SELECT project_no,
+        inner_no
+        FROM order_base_info
+        WHERE enable_flag = 10
+        <if test="flag == true">
+            project_no like concat(#{dto.projectNo},'%')
+        </if>
+        <if test="flag == false">
+            inner_no like concat(#{dto.innerNo},'%')
+        </if>
+    </select>
+</mapper>