Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit f8b99238
由
LN
编写于
2024-08-15 13:47:07 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
单据根据创建时间倒序
1 个父辈
6e54aa55
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
6 行增加
和
0 行删除
src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpReturnInventoryController.java
src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpSpareNoController.java
src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpUnclaimedController.java
src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpReturnInventoryController.java
查看文件 @
f8b9923
...
@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiOperation;
...
@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiOperation;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
@@ -113,6 +114,7 @@ public class SpReturnInventoryController {
...
@@ -113,6 +114,7 @@ public class SpReturnInventoryController {
//criteria = criteria.and(attributeName).regex(pattern);
//criteria = criteria.and(attributeName).regex(pattern);
query
.
addCriteria
(
Criteria
.
where
(
"no"
).
regex
(
pattern
));
query
.
addCriteria
(
Criteria
.
where
(
"no"
).
regex
(
pattern
));
}
}
query
.
with
(
Sort
.
by
(
Sort
.
Direction
.
DESC
,
"createDate"
));
PageData
<
ReturnInventoryNo
>
resultList
=
returnNoManager
.
findByPage
(
query
,
pageable
);
PageData
<
ReturnInventoryNo
>
resultList
=
returnNoManager
.
findByPage
(
query
,
pageable
);
return
resultList
;
return
resultList
;
}
}
...
...
src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpSpareNoController.java
查看文件 @
f8b9923
...
@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
...
@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
@@ -133,6 +134,7 @@ public class SpSpareNoController {
...
@@ -133,6 +134,7 @@ public class SpSpareNoController {
//criteria = criteria.and(attributeName).regex(pattern);
//criteria = criteria.and(attributeName).regex(pattern);
query
.
addCriteria
(
Criteria
.
where
(
"no"
).
regex
(
pattern
));
query
.
addCriteria
(
Criteria
.
where
(
"no"
).
regex
(
pattern
));
}
}
query
.
with
(
Sort
.
by
(
Sort
.
Direction
.
DESC
,
"createDate"
));
PageData
<
SpareNo
>
resultList
=
spareNoManager
.
findByPage
(
query
,
pageable
);
PageData
<
SpareNo
>
resultList
=
spareNoManager
.
findByPage
(
query
,
pageable
);
return
resultList
;
return
resultList
;
}
}
...
...
src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpUnclaimedController.java
查看文件 @
f8b9923
...
@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiOperation;
...
@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiOperation;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
@@ -201,6 +202,7 @@ public class SpUnclaimedController {
...
@@ -201,6 +202,7 @@ public class SpUnclaimedController {
// query.addCriteria(c);
// query.addCriteria(c);
// }
// }
}
}
query
.
with
(
Sort
.
by
(
Sort
.
Direction
.
DESC
,
"createDate"
));
PageData
<
LiteOrder
>
resultList
=
liteOrderManager
.
findByPage
(
query
,
pageable
);
PageData
<
LiteOrder
>
resultList
=
liteOrderManager
.
findByPage
(
query
,
pageable
);
PageData
<
Unclaimed
>
data
=
new
PageData
<
Unclaimed
>();
PageData
<
Unclaimed
>
data
=
new
PageData
<
Unclaimed
>();
data
.
setTotalElements
(
resultList
.
getTotalElements
());
data
.
setTotalElements
(
resultList
.
getTotalElements
());
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论