From 7299b1b4e0730fecb92021c4ae95e2ac1a13ea3d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 26 五月 2025 00:26:27 +0800
Subject: [PATCH] 人员培训修改成电子签
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
index ce749a6..1caa282 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.inspect.dto.InsOrderPlanDTO;
import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
+import com.ruoyi.inspect.dto.SaveInsContextDto;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
import com.ruoyi.inspect.vo.InsOrderPlanVO;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -24,7 +26,7 @@
boolean claimInsOrderPlan(InsOrderPlanDTO entity);
- void saveInsContext(Map<String, Object> insContext,Integer currentTable,Integer sampleId,Integer orderId,String sonLaboratory);
+ void saveInsContext(SaveInsContextDto saveInsContextDto);
Map<String, Object> doInsOrder(Integer id, String laboratory);
@@ -69,30 +71,19 @@
*/
List<Map<String, Object>> getRepetitionTag(Integer id, String laboratory, String cableTag);
- /**
- * 鑾峰彇涓嶅悎鏍兼暟鎹�
- * @return
- */
- List<InsProduct> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto);
/**
* 鏂板涓嶅悎鏍煎娴嬪唴瀹圭粰
* @param ids
* @return
*/
- boolean addDisqualificationRetest(List<Integer> ids);
+ boolean addDisqualificationRetest(List<InsProduct> insProductsList);
/**
* 鑾峰彇涓嶅悎鏍煎娴嬫暟鎹�
- * @param id
- * @param type
- * @param laboratory
- * @param cableTag
- * @param rawMaterialTag
- * @param retestTag
* @return
*/
- List<InsProduct> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag);
+ List<InsProduct> getInsProductUnqualifiedRetest(InsOrderPlanProductDto insOrderPlanProductDto);
/**
* 淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�
--
Gitblit v1.9.3