From 6a462fcca2e65cc3a38ed79522d966306756341f Mon Sep 17 00:00:00 2001 From: wujian <14790700720@163.com> Date: 星期一, 13 五月 2024 15:15:02 +0800 Subject: [PATCH] fix 页面自动定位 add 外部接口调用 --- jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 18 ++++++++++++++++++ 1 files changed, 18 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 e8acbcc..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()); @@ -108,6 +117,15 @@ /** * 鎵爜纭 */ + @GetMapping("/jrmUpdateResults") + public AjaxResult jrmUpdateResults(BsFormulaChildInfo bsFormulaChildInfo) + { + return bsFormulaChildInfoService.jrmUpdateResults(bsFormulaChildInfo); + } + + /** + * 鎵爜纭 + */ @GetMapping("/yzUpdateResults") public AjaxResult yzUpdateResults(BsFormulaChildInfo bsFormulaChildInfo) { -- Gitblit v1.9.3