From 1c7f8349d7bfe51e2e1fc9cdabed44443254aef1 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期五, 19 一月 2024 10:49:26 +0800
Subject: [PATCH] 工艺路线主子表修改
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 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..7657346 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,9 @@
{
@Autowired
private IBsFormulaChildInfoService bsFormulaChildInfoService;
+
+ @Autowired
+ private ProductProcessService productProcessService;
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
@@ -48,6 +49,19 @@
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
+ * @return list
+ */
+ @PostMapping("/getProductProcess")
+ public TableDataInfo getProductProcess(@RequestBody ProductProcessQuery productProcessQuery)
+ {
+ List<BsFormulaChildInfo> list = productProcessService.getProductProcess(productProcessQuery);
return getDataTable(list);
}
--
Gitblit v1.9.3