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 | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 b8914d7..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,15 +1,22 @@
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;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.mapper.TaskDispatchMapper;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
/**
* 浠诲姟娲惧伐鏁版嵁 澶勭悊鏈嶅姟
@@ -20,19 +27,53 @@
@Service
@AllArgsConstructor
public class TaskDispatchService extends BizServiceImpl<TaskDispatchMapper, TaskDispatch> {
+ @Autowired
+ private ParamService paramService;
@Transactional(rollbackFor = Exception.class)
- public long 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.getId();
+ return taskDispatch;
}
-
+ /*
public void updateSuccess(long id, String instId) {
TaskDispatch taskDispatch = getById(id);
taskDispatch.setProcessInstanceId(instId);
+ taskDispatch.setStatus(TaskDispatch.STATUS_STARTED);
this.updateById(taskDispatch);
}
+
+ */
+
+
+ /**
+ * 妫�鏌ユ槸鍚﹂噸澶嶆淳宸�
+ * @param startVO
+ * @return
+ */
+ public boolean checkIsDuplicate(TaskAssignVO startVO) {
+ if(startVO.isTemporaryFlow()){
+ //璇曞垏琛ュ厖锛屼笉楠岃瘉閲嶅
+ return false;
+ }
+
+ int taskDupDays = Func.toInt(paramService.taskDuplateCheckDays());
+ LocalDateTime checkStartDate = LocalDateTime.now().minusDays(taskDupDays);
+ 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);
+
+ long cnt = q.count();
+
+ return cnt > 0;
+ }
+
}
--
Gitblit v1.9.3