Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
W
warehouse
概览
Overview
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
苗卫卫
warehouse
Commits
bd130a96
提交
bd130a96
authored
1 年前
作者:
zhangqiliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
可以模糊查询订单表中安装完成状态之前的订单号
父级
b967a516
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
13 行增加
和
6 行删除
+13
-6
src/main/java/com/boco/nbd/wios/manage/controller/OemController.java
+2
-1
src/main/java/com/boco/nbd/wios/manage/controller/OrderController.java
+1
-4
src/main/java/com/boco/nbd/wios/manage/service/impl/OrderService.java
+4
-0
src/main/resources/mybatis/mapper/def/common/OrderMapper.xml
+6
-1
没有找到文件。
src/main/java/com/boco/nbd/wios/manage/controller/OemController.java
查看文件 @
bd130a96
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/boco/nbd/wios/manage/controller/OrderController.java
查看文件 @
bd130a96
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/boco/nbd/wios/manage/service/impl/OrderService.java
查看文件 @
bd130a96
...
@@ -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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mybatis/mapper/def/common/OrderMapper.xml
查看文件 @
bd130a96
...
@@ -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
<
64
<where>
<if
test=
"id != null and id != ''"
>
id like concat('%',#{id}, '%')
</if>
and status
<
64
</where>
order by create_time desc
order by create_time desc
</select>
</select>
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论