other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改3-15问题

Browse Source
This commit is contained in:
dimengzhe
2023-03-16 11:10:02 +08:00
parent a9ad4b021c
commit 91e9a56f74
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
View File

@@ -72,6 +72,10 @@ public class OmsOrderController {
qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')" apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')"
); );
if(StringUtils.isNotBlank(omsOrderQuery.getStatus())){
qw.eq("status",omsOrderQuery.getStatus());
}
return new CommonResult().success(IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList))); return new CommonResult().success(IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList)));
} catch (Exception e) { } catch (Exception e) {

2
mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java
View File

@@ -19,4 +19,6 @@ public class OmsOrderQuery {
@ApiModelProperty(value = "提交结束时间",required = false) @ApiModelProperty(value = "提交结束时间",required = false)
private String createTimeEnd; private String createTimeEnd;
private String status;
} }