Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

排单中小板查询添加异性、造型过滤

Browse Source
This commit is contained in:
yangsb
2024-04-29 14:48:05 +08:00
parent 6d6765cf9f
commit b6a67406e7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java
+4 -2
View File
@@ -32,8 +32,8 @@ public class OrderPageReqVOCopy extends PageParam {
private String consigneeAddress; private String consigneeAddress;
@Schema(description = "状态列表") @Schema(description = "状态列表")
private List<Integer> stateList; private List<Integer> stateList;
@Schema(description = "矩形") /*@Schema(description = "矩形")
private Boolean rectangle; private Boolean rectangle;*/
@Schema(description = "异形") @Schema(description = "异形")
private Boolean specialShaped; private Boolean specialShaped;
@Schema(description = "造型") @Schema(description = "造型")
@@ -44,6 +44,8 @@ public class OrderPageReqVOCopy extends PageParam {
private Boolean burrow; private Boolean burrow;
@Schema(description = "有二维纹路") @Schema(description = "有二维纹路")
private Boolean twoDimensionalToolPath; private Boolean twoDimensionalToolPath;
@Schema(description = "门板")
private Boolean isDoor;
@Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]") @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+5
View File
@@ -249,6 +249,9 @@ public class PlanServiceImpl implements PlanService {
.eqIfPresent("address", pageReqVO.getConsigneeAddress()) .eqIfPresent("address", pageReqVO.getConsigneeAddress())
.eqIfPresent("custom_order_no", pageReqVO.getDefaultId()) .eqIfPresent("custom_order_no", pageReqVO.getDefaultId())
.betweenIfPresent("a.create_time", pageReqVO.getCreateTime()) .betweenIfPresent("a.create_time", pageReqVO.getCreateTime())
.eqIfPresent("op.is_special_shaped", pageReqVO.getSpecialShaped())
.eqIfPresent("op.is_sculpt", pageReqVO.getSculpt())
.eqIfPresent("op.is_door", pageReqVO.getIsDoor())
.betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()}) .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
.betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()} ) .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()} )
; ;
@@ -336,6 +339,8 @@ public class PlanServiceImpl implements PlanService {
queryWrapperX.eq("p.plan_id", vo.getPlanId()) queryWrapperX.eq("p.plan_id", vo.getPlanId())
.eqIfPresent("a.is_door", vo.getIsDoor()) .eqIfPresent("a.is_door", vo.getIsDoor())
.eqIfPresent("a.is_special_shaped", vo.getSpecialShaped())
.eqIfPresent("a.is_sculpt", vo.getSculpt())
.betweenIfPresent("a.width", new BigDecimal[]{vo.getWidthMinRang(), vo.getWidthMaxRang()}) .betweenIfPresent("a.width", new BigDecimal[]{vo.getWidthMinRang(), vo.getWidthMaxRang()})
.betweenIfPresent("a.height", new BigDecimal[]{vo.getLongMinRang(), vo.getLongMaxRang()}) .betweenIfPresent("a.height", new BigDecimal[]{vo.getLongMinRang(), vo.getLongMaxRang()})
.inIfPresent("a.filter_type", filterTypes) .inIfPresent("a.filter_type", filterTypes)