From 7ff5e9edadf446d0d033574a7b0ae802f5ac2233 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期六, 17 二月 2024 15:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 7657346..ec79b6f 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
@@ -35,6 +35,8 @@
@Autowired
private ProductProcessService productProcessService;
+ private static final String ZERO = "0";
+
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
@@ -49,19 +51,45 @@
formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
formulaChildInfo.setImg(formulaChildInfo.getPicture());
}
- list = list.stream().sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());
+
return getDataTable(list);
}
/**
* 鏌ヨ宸ヨ壓娴佺▼
- * @param productProcessQuery query
+ * @param bsFormulaChildInfo query
* @return list
*/
@PostMapping("/getProductProcess")
- public TableDataInfo getProductProcess(@RequestBody ProductProcessQuery productProcessQuery)
+ public TableDataInfo getProductProcess(@RequestBody BsFormulaChildInfo bsFormulaChildInfo)
{
- List<BsFormulaChildInfo> list = productProcessService.getProductProcess(productProcessQuery);
+ List<BsFormulaChildInfo> list = bsFormulaChildInfoService.selectBsFormulaChildInfoList(bsFormulaChildInfo);
+ for (BsFormulaChildInfo formulaChildInfo : list) {
+ formulaChildInfo.setSort(formulaChildInfo.getStepSort());
+ formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
+ formulaChildInfo.setImg(formulaChildInfo.getPicture());
+ }
+ list = list.stream()
+ .filter(x -> !ZERO.equals(x.getSort())).sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ宸ヨ壓鏂囦欢
+ * @param bsFormulaChildInfo query
+ * @return list
+ */
+ @PostMapping("/getMainProductProcess")
+ public TableDataInfo getMainProductProcess(@RequestBody BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ List<BsFormulaChildInfo> list = bsFormulaChildInfoService.selectBsFormulaChildInfoList(bsFormulaChildInfo);
+ for (BsFormulaChildInfo formulaChildInfo : list) {
+ formulaChildInfo.setSort(formulaChildInfo.getStepSort());
+ formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
+ formulaChildInfo.setImg(formulaChildInfo.getPicture());
+ }
+ list = list.stream()
+ .filter(x -> ZERO.equals(x.getSort())).sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());
return getDataTable(list);
}
--
Gitblit v1.9.3