licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化sql

Browse Source
This commit is contained in:
think 2025-02-07 17:43:09 +08:00
parent d7a5498850
commit 533ac6300e
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java
View File

@ -107,7 +107,7 @@ public class TaskDispatchDetailTotalVO {
private BigDecimal maxLongTime; private BigDecimal maxLongTime;
@Schema(description = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE") @Schema(description = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE")
private String dispatchType; private String dispatchTypes;
} }

7
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
View File

@ -255,6 +255,11 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
// 计算时间范围 // 计算时间范围
LocalDateTime startDate = sTime.minusDays(3).withHour(0).withMinute(0).withSecond(0); LocalDateTime startDate = sTime.minusDays(3).withHour(0).withMinute(0).withSecond(0);
LocalDateTime endDate = sTime.plusDays(3).withHour(23).withMinute(59).withSecond(59); LocalDateTime endDate = sTime.plusDays(3).withHour(23).withMinute(59).withSecond(59);
// 构建查询条件过滤数据 // 构建查询条件过滤数据
int isHaveOf = 0; int isHaveOf = 0;
MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>(); MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
@ -269,7 +274,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
//增加一个关联查询条件 ，装配派工只查装配派工，生产派工只查生产派工 //增加一个关联查询条件 ，装配派工只查装配派工，生产派工只查生产派工
query2.selectAll(TaskDispatchDetailDO.class); query2.selectAll(TaskDispatchDetailDO.class);
query2.leftJoin(TaskDispatchDO.class,"a",TaskDispatchDO::getId,TaskDispatchDetailDO::getDispatchId) query2.leftJoin(TaskDispatchDO.class,"a",TaskDispatchDO::getId,TaskDispatchDetailDO::getDispatchId)
.eq(TaskDispatchDO::getDispatchType,pageTotalVO.getDispatchType()); .eq(TaskDispatchDO::getDispatchType,pageTotalVO.getDispatchTypes());
query2.eq(TaskDispatchDetailDO::getDeviceModel, pageTotalVO.getDeviceModel()) query2.eq(TaskDispatchDetailDO::getDeviceModel, pageTotalVO.getDeviceModel())
.and(wrapper -> { .and(wrapper -> {
wrapper.ge(TaskDispatchDetailDO::getStartTime, startDate) wrapper.ge(TaskDispatchDetailDO::getStartTime, startDate)

4
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
View File

@ -710,7 +710,7 @@ watch(
console.log("detail==", detail) console.log("detail==", detail)
if(detail.startTime){ if(detail.startTime){
//设置派工类型 //设置派工类型
detail.dispatchType = "ASSEMBLE"; detail.dispatchTypes = "ASSEMBLE";
openDialogWT(detail); openDialogWT(detail);
} }
} }
@ -724,7 +724,7 @@ watch(
console.log("detail==", detail); console.log("detail==", detail);
if (detail.startTime) { if (detail.startTime) {
//设置派工类型 //设置派工类型
detail.dispatchType = "ASSEMBLE"; detail.dispatchTypes = "ASSEMBLE";
openDialogWT(detail); openDialogWT(detail);
} }
} }

4
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
View File

@ -756,7 +756,7 @@ watch(
console.log("detail=", detail.startTime) console.log("detail=", detail.startTime)
if(detail.startTime){ if(detail.startTime){
//设置派工类型 //设置派工类型
detail.dispatchType = "PRODUCTION"; detail.dispatchTypes = "PRODUCTION";
openDialogWT(detail); openDialogWT(detail);
} }
} }
@ -770,7 +770,7 @@ watch(
console.log("detail==", detail); console.log("detail==", detail);
if (detail.startTime) { if (detail.startTime) {
//设置派工类型 //设置派工类型
detail.dispatchType = "PRODUCTION"; detail.dispatchTypes = "PRODUCTION";
openDialogWT(detail); openDialogWT(detail);
} }
} }