From 616f9896be815a60b5c4063116b7d138892dcfaf Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 14 五月 2024 14:59:25 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 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 40ddd9b..6814c17 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
@@ -1,9 +1,12 @@
package com.jcdm.main.bs.formulaChild.controller;
import java.util.List;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jcdm.main.constant.Constants;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +48,12 @@
List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
.eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
.eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode()));
+ if (CollUtil.isNotEmpty(list)){
+ List<BsFormulaChildInfo> collect1 = list.stream().filter(x -> Constants.OK.equals(x.getResults())).collect(Collectors.toList());
+ List<BsFormulaChildInfo> collect2 = list.stream().filter(x -> !Constants.OK.equals(x.getResults())).collect(Collectors.toList());
+ list = collect1;
+ list.addAll(collect2);
+ }
for (BsFormulaChildInfo formulaChildInfo : list) {
// formulaChildInfo.setSort(formulaChildInfo.getStepSort());
// formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
@@ -106,6 +115,24 @@
}
/**
+ * 鎵爜纭
+ */
+ @GetMapping("/jrmUpdateResults")
+ public AjaxResult jrmUpdateResults(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ return bsFormulaChildInfoService.jrmUpdateResults(bsFormulaChildInfo);
+ }
+
+ /**
+ * 鎵爜纭
+ */
+ @GetMapping("/yzUpdateResults")
+ public AjaxResult yzUpdateResults(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ return bsFormulaChildInfoService.yzUpdateResults(bsFormulaChildInfo);
+ }
+
+ /**
* 鏀捐璇风┖鐘舵��
*/
@GetMapping("/workpieceRelease")
@@ -124,6 +151,15 @@
}
/**
+ * 鎷х揣鍚庢洿鏂板搴旀暟鎹�
+ */
+ @GetMapping("/yzUpdateTighteningFormula")
+ public AjaxResult yzUpdateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ return bsFormulaChildInfoService.yzUpdateTighteningFormula(bsFormulaChildInfo);
+ }
+
+ /**
* 瀵煎嚭閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
@PreAuthorize("@ss.hasPermi('bs:formulaChild:export')")
--
Gitblit v1.9.3