提交 bd130a96 作者: zhangqiliang

可以模糊查询订单表中安装完成状态之前的订单号

父级 b967a516
...@@ -16,6 +16,7 @@ import io.swagger.annotations.Api; ...@@ -16,6 +16,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -35,7 +36,7 @@ import java.util.List; ...@@ -35,7 +36,7 @@ import java.util.List;
@RestController @RestController
@RequestMapping("api") @RequestMapping("api")
@Api(tags = "主机厂和经销商管理接口") @Api(tags = "主机厂和经销商管理接口")
@ApiIgnore @Slf4j
public class OemController { public class OemController {
@Autowired @Autowired
private OemService oemService; private OemService oemService;
......
...@@ -22,10 +22,7 @@ import io.swagger.annotations.ApiImplicitParams; ...@@ -22,10 +22,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import java.text.ParseException; import java.text.ParseException;
......
...@@ -765,6 +765,10 @@ public class OrderService { ...@@ -765,6 +765,10 @@ public class OrderService {
* @return * @return
*/ */
public List<InstallComplete> installCompleteList(OrderBo condition) { public List<InstallComplete> installCompleteList(OrderBo condition) {
PageLimit pageLimit = PageLimitHolderFilter.getContext();
if (pageLimit != null) {
pageLimit.setLimited(true);
}
return orderMapper.installCompleteList(condition); return orderMapper.installCompleteList(condition);
} }
......
...@@ -1469,7 +1469,12 @@ install_staff_phone,oem_agent_code,install_pack_type,survey_pack_type,know_after ...@@ -1469,7 +1469,12 @@ install_staff_phone,oem_agent_code,install_pack_type,survey_pack_type,know_after
resultType="com.boco.nbd.wios.manage.entity.bo.InstallComplete"> resultType="com.boco.nbd.wios.manage.entity.bo.InstallComplete">
select id,out_order_id,warehouse_id,status select id,out_order_id,warehouse_id,status
from t_order from t_order
where status &lt; 64 <where>
<if test="id != null and id != ''">
id like concat('%',#{id}, '%')
</if>
and status &lt; 64
</where>
order by create_time desc order by create_time desc
</select> </select>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论