From b4d10ff7535002dddb63a0b28ddb37fee7ed1e9d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 03 十二月 2025 16:30:53 +0800
Subject: [PATCH] 增加pdf，xlsx，docx文件预览功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 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 c72e8ca..1bf86f9 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
@@ -4,12 +4,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BizServiceImpl;
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.springblade.mdm.program.entity.DrawingNos;
+import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.mapper.DrawingNosMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -125,12 +128,39 @@
}
/**
- * 鏍规嵁mes鍞竴鏍囪瘑鑾峰彇娲惧伐鏁版嵁
- * @param mesTaskId
+ * 鏍规嵁宸ュ簭鍞竴鐮佽幏鍙栨淳宸ユ暟鎹�
+ * @param operationId 宸ュ簭鍞竴鐮�
* @return
*/
- public TaskDispatch getByMesTaskId(String mesTaskId) {
- Optional<TaskDispatch> opt = lambdaQuery().eq(TaskDispatch::getMesTaskId, mesTaskId).oneOpt();
+ public TaskDispatch getByOperationId(String operationId) {
+ Optional<TaskDispatch> opt = lambdaQuery().eq(TaskDispatch::getOperationId, operationId).oneOpt();
return opt.orElse(null);
}
+
+ /**
+ * 鏍规嵁绋嬪簭鍐呴儴缂栧彿鑾峰彇瀹炰綋
+ * @param programNo 鍐呴儴缂栧彿
+ * @return 瀹炰綋
+ */
+ public TaskDispatch getByProgramNo(String programNo) {
+ return lambdaQuery().eq(TaskDispatch::getProgramNo, programNo).one();
+ }
+
+
+ /**
+ * 鏌ヨ鍋忕鍗曠殑搴忓彿
+ * @param programNo 鍋忕鍗曠殑绋嬪簭鍖呭悕鑺傜偣
+ * @return 搴忓彿
+ */
+ public long getDeviationSerial(String programNo) {
+ TaskDispatch dispatch = this.getByProgramNo(programNo);
+
+ return lambdaQuery()
+ .eq(TaskDispatch::getDrawingNo,dispatch.getDrawingNo())
+ .eq(TaskDispatch::getProcessNo,dispatch.getProcessNo())
+ .eq(TaskDispatch::getProcessEdition,dispatch.getProcessEdition())
+ .eq(TaskDispatch::getDeviation,dispatch.getDeviation())
+ .le(TaskDispatch::getCreateTime,dispatch.getCreateTime()) //鏃堕棿灏忎簬绛変簬褰撳墠鑺傜偣
+ .count();
+ }
}
--
Gitblit v1.9.3