From 5a7683e98e626cba3b52fd621b4d5340e16b6f2a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 15 三月 2025 15:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java
index 3fed7cc..74225cc 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java
@@ -1,6 +1,7 @@
package com.mes.pp.service.impl;
import com.mes.pp.entity.FlowCard;
+import com.mes.pp.entity.dto.FlowCardDTO;
import com.mes.pp.mapper.FlowCardMapper;
import com.mes.pp.service.FlowCardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,7 +12,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -21,17 +22,22 @@
public class FlowCardServiceImpl extends ServiceImpl<FlowCardMapper, FlowCard> implements FlowCardService {
@Override
- public List<Map<String, Object>> selectProject(String processId, Integer technologyNumber){
- return baseMapper.selectProject(processId,technologyNumber);
+ public List<Map<String, Object>> selectProject(String processId, Integer technologyNumber) {
+ return baseMapper.selectProject(processId, technologyNumber);
}
@Override
- public List<Map<String, Object>> selectFlowCard(String processId, Integer technologyNumber){
+ public List<Map<String, Object>> selectFlowCard(String processId, Integer technologyNumber) {
return baseMapper.selectFlowCard(processId, technologyNumber);
}
@Override
- public List<Map<String, Object>> selectLabel(String processId, Integer technologyNumber){
+ public List<Map<String, Object>> selectLabel(String processId, Integer technologyNumber) {
return baseMapper.selectLabel(processId, technologyNumber);
}
+
+ @Override
+ public List<FlowCardDTO> flowCardReportForms(String orderId) {
+ return baseMapper.flowCardReportForms(orderId);
+ }
}
--
Gitblit v1.8.0