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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1625修复

Browse Source
This commit is contained in:
gaoqr
2026-06-09 10:32:27 +08:00
parent ea4168321a
commit 698bd77e1c
2 changed files with 6 additions and 1 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
+3
View File
@@ -30,6 +30,9 @@ public class OrderPageReqVOCopy extends PageParam {
@Length(max = 32,message = "自定义单号数据过长，请重新输入")
private String defaultId;
@Schema(description = "订单类型")
private Integer orderType;
@Schema(description = "客户")
@Length(max = 255, message = "客户数据过长，请重新输入")
private String consignee;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+3 -1
View File
@@ -144,6 +144,7 @@ public class PlanServiceImpl implements PlanService {
// 重复使用的常量
private static final String FIELD_ORDER_ID = "o.id";
private static final String FIELD_ORDER_TYPE = "o.order_type";
private static final String FIELD_OP_IS_SPECIAL_SHAPED = "op.is_special_shaped";
private static final String FIELD_PLANID = "planId";
private static final String FIELD_ORGAN_ID = "o.organ_id";
@@ -568,7 +569,8 @@ public class PlanServiceImpl implements PlanService {
.likeIfPresent(FIELD_CUSTOMER, pageReqVO.getConsignee())
.likeIfPresent(FIELD_CUSTOM_ORDER_NO, pageReqVO.getDefaultId())
.likeIfPresent(FIELD_ADDRESS, pageReqVO.getConsigneeAddress())
.betweenIfPresent(FIELD_ORDER_DATE, LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime()));
.betweenIfPresent(FIELD_ORDER_DATE, LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime()))
.eqIfPresent(FIELD_ORDER_TYPE, pageReqVO.getOrderType());
PageDTO<OrderRespVOCopy> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
// 查询满足未排单条件的顶级订单id