From 220f7b818bb9399391830fbbb9fb2028a21b938f Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期三, 21 二月 2024 00:23:34 +0800
Subject: [PATCH] 批量数据采集方法更新

---
 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java |   70 ++++++++++++++++++++++++++++-------
 1 files changed, 56 insertions(+), 14 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 3c54be3..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
@@ -1,25 +1,23 @@
 package com.jcdm.main.bs.formulaChild.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.jcdm.common.annotation.Log;
 import com.jcdm.common.core.controller.BaseController;
 import com.jcdm.common.core.domain.AjaxResult;
+import com.jcdm.common.core.page.TableDataInfo;
 import com.jcdm.common.enums.BusinessType;
+import com.jcdm.common.utils.poi.ExcelUtil;
+import com.jcdm.main.bs.formulaChild.Query.ProductProcessQuery;
 import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
 import com.jcdm.main.bs.formulaChild.service.IBsFormulaChildInfoService;
-import com.jcdm.common.utils.poi.ExcelUtil;
-import com.jcdm.common.core.page.TableDataInfo;
+import com.jcdm.main.bs.formulaChild.service.impl.ProductProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 閰嶆柟閰嶇疆瀛愪俊鎭疌ontroller
@@ -33,6 +31,11 @@
 {
     @Autowired
     private IBsFormulaChildInfoService bsFormulaChildInfoService;
+
+    @Autowired
+    private ProductProcessService productProcessService;
+
+    private static final String ZERO = "0";
 
     /**
      * 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
@@ -48,6 +51,45 @@
             formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
             formulaChildInfo.setImg(formulaChildInfo.getPicture());
         }
+
+        return getDataTable(list);
+    }
+
+    /**
+     * 鏌ヨ宸ヨ壓娴佺▼
+     * @param bsFormulaChildInfo query
+     * @return list
+     */
+    @PostMapping("/getProductProcess")
+    public TableDataInfo getProductProcess(@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);
+    }
+
+    /**
+     * 鏌ヨ宸ヨ壓鏂囦欢
+     * @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