From 8e60278048df6d44a81ca8626cac63e5deab2761 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 28 八月 2025 15:10:05 +0800
Subject: [PATCH] 机床修改，增加文件对比
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
index 044e090..5db58b1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
@@ -1,6 +1,7 @@
package org.springblade.mdm.flow.service;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BizServiceImpl;
@@ -15,6 +16,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 浠诲姟娲惧伐鏁版嵁 澶勭悊鏈嶅姟
@@ -29,9 +31,12 @@
private ParamService paramService;
@Transactional(rollbackFor = Exception.class)
- public TaskDispatch saveTask(TaskAssignVO startVO) {
+ public TaskDispatch saveTask(TaskAssignVO startVO,boolean isDup) {
TaskDispatch taskDispatch = new TaskDispatch();
BeanUtils.copyProperties(startVO, taskDispatch);
+ if(isDup){
+ taskDispatch.setStatus(TaskDispatch.STATUS_DUP);
+ }
this.save(taskDispatch);
return taskDispatch;
@@ -60,12 +65,13 @@
int taskDupDays = Func.toInt(paramService.taskDuplateCheckDays());
LocalDateTime checkStartDate = LocalDateTime.now().minusDays(taskDupDays);
- long cnt = lambdaQuery().eq(TaskDispatch::getDrawingNo,startVO.getDrawingNo())
+ LambdaQueryChainWrapper<TaskDispatch> q = lambdaQuery().eq(TaskDispatch::getDrawingNo,startVO.getDrawingNo())
.eq(TaskDispatch::getProcessNo,startVO.getProcessNo())
.eq(TaskDispatch::getProcessEdition,startVO.getProcessEdition())
.eq(TaskDispatch::getMachineCode,startVO.getMachineCode())
- .gt(TaskDispatch::getCreateTime,checkStartDate)
- .count();
+ .gt(TaskDispatch::getCreateTime,checkStartDate);
+
+ long cnt = q.count();
return cnt > 0;
}
--
Gitblit v1.9.3