opt:数据查询修改
This commit is contained in:
@@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
<select id="allocationDetailPage" resultType="org.nl.wms.database.eas.dto.AllocationBillQuery">
|
<select id="allocationDetailPage" resultType="org.nl.wms.database.eas.dto.AllocationBillQuery">
|
||||||
SELECT * FROM (
|
SELECT * FROM (
|
||||||
SELECT V.*, ROW_NUMBER() OVER (ORDER BY V.CJSJ DESC) AS RNUM
|
SELECT V.*, ROW_NUMBER() OVER (ORDER BY V.YWRQ DESC) AS RNUM
|
||||||
FROM EAS_NOBLE.V_UC_STOCKTRANSFERBILL V
|
FROM EAS_NOBLE.V_UC_STOCKTRANSFERBILL V
|
||||||
WHERE V.DJID = #{djid}
|
WHERE V.DJID = #{djid}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -86,7 +86,14 @@ public class AllocationBillServiceImpl extends ServiceImpl<AllocationBillMapper,
|
|||||||
// 查询总记录数
|
// 查询总记录数
|
||||||
long totalCount = allocationBillMapper.getTotalCount(params.getDjid());
|
long totalCount = allocationBillMapper.getTotalCount(params.getDjid());
|
||||||
List<AllocationBillQuery> allocationBillList = allocationBillMapper.allocationDetailPage(params.getPage(), params.getSize(), params.getDjid(), params.getFuzzy());
|
List<AllocationBillQuery> allocationBillList = allocationBillMapper.allocationDetailPage(params.getPage(), params.getSize(), params.getDjid(), params.getFuzzy());
|
||||||
if (!allocationBillList.isEmpty()) {
|
if (allocationBillList.isEmpty()) {
|
||||||
|
allocationBillList = allocationBillList.stream().peek(r -> {
|
||||||
|
if (r.getJhdrrq().contains("/") || r.getJhdcrq().contains("/")) {
|
||||||
|
r.setJhdrrq(LocalDateTime.parse(r.getJhdrrq(), DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")).toLocalDate().toString());
|
||||||
|
r.setJhdcrq(LocalDateTime.parse(r.getJhdcrq(), DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")).toLocalDate().toString());
|
||||||
|
}
|
||||||
|
}).collect(Collectors.toList());
|
||||||
|
} else {
|
||||||
// 获取更新列表
|
// 获取更新列表
|
||||||
List<AllocationBill> updateList = allocationBillMapper.selectList(
|
List<AllocationBill> updateList = allocationBillMapper.selectList(
|
||||||
new LambdaQueryWrapper<AllocationBill>().eq(AllocationBill::getDjid, allocationBillList.get(0).getDjid()));
|
new LambdaQueryWrapper<AllocationBill>().eq(AllocationBill::getDjid, allocationBillList.get(0).getDjid()));
|
||||||
|
|||||||
Reference in New Issue
Block a user