From 0caf8761b4af8163a691ebb56723286926529ee4 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 29 三月 2024 15:29:38 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
index a065715..40ddd9b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +39,31 @@
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
+ @GetMapping("/noPageListFormulaChild")
+ public TableDataInfo noPageListFormulaChild(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+ .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
+ .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode()));
+ for (BsFormulaChildInfo formulaChildInfo : list) {
+// formulaChildInfo.setSort(formulaChildInfo.getStepSort());
+// formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
+// formulaChildInfo.setImg(formulaChildInfo.getOperationSteps());
+ if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
+ if(formulaChildInfo.getCollectData().contains("[")){
+ String data = formulaChildInfo.getCollectData();
+ data = data.replace("[", "").replace("]", "").replace(" ", "");
+ String[] tightenDataParts = data.split(",");
+ formulaChildInfo.setCollectData("鎵煩"+tightenDataParts[0]+"瑙掑害"+tightenDataParts[1]+"鎵煩缁撴灉"+tightenDataParts[2]+"瑙掑害缁撴灉"+tightenDataParts[3]);
+ }
+ }
+ }
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
+ */
@PreAuthorize("@ss.hasPermi('bs:formulaChild:list')")
@GetMapping("/list")
public TableDataInfo list(BsFormulaChildInfo bsFormulaChildInfo)
--
Gitblit v1.9.3