DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排产模块优化 / 排产单页面优化，排产模块优化 / 订单跟踪页面优化

Browse Source
This commit is contained in:
朱昊天
2026-07-09 17:13:46 +08:00
parent 2cd141262b
commit a0c7da8fe0
14 changed files with 723 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java
View File

@@ -265,4 +265,14 @@ public class CrmOrderBo extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date deliveryDateEnd;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date bindDateStart;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date bindDateEnd;
private Boolean onlyBoundSchedule;
}

18
klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java
View File

@@ -247,6 +247,24 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
qw.lt(bo.getSignDateEnd() != null, "co.sign_time", addOneDay(bo.getSignDateEnd()));
qw.ge(bo.getDeliveryDateStart() != null, "co.delivery_date", bo.getDeliveryDateStart());
qw.lt(bo.getDeliveryDateEnd() != null, "co.delivery_date", addOneDay(bo.getDeliveryDateEnd()));
boolean applyBoundFilter = Boolean.TRUE.equals(bo.getOnlyBoundSchedule())
|| bo.getBindDateStart() != null
|| bo.getBindDateEnd() != null;
if (applyBoundFilter) {
StringBuilder existsSql = new StringBuilder();
List<Object> args = new ArrayList<>();
existsSql.append("exists (select 1 from sch_sale_schedule_rel rel where rel.del_flag = 0 and rel.order_id = co.order_id");
if (bo.getBindDateStart() != null) {
existsSql.append(" and rel.create_time >= {").append(args.size()).append("}");
args.add(bo.getBindDateStart());
}
if (bo.getBindDateEnd() != null) {
existsSql.append(" and rel.create_time < {").append(args.size()).append("}");
args.add(addOneDay(bo.getBindDateEnd()));
}
existsSql.append(")");
qw.apply(existsSql.toString(), args.toArray());
}
if(bo.getOrderIds() !=null){
qw.in(!bo.getOrderIds().isEmpty(), "co.order_id", bo.getOrderIds());
}