袁少华 il y a 4 ans
Parent
commit
fdf1d20b7d

+ 20 - 0
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsPuArrivalvouchController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsPuArrivalvouch.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.appInterface.FileList;
 import org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch;
 import org.jeecg.modules.fbsPuArrivalvouch.service.IFbsPuArrivalvouchService;
 
@@ -26,6 +28,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -45,6 +48,8 @@ import com.alibaba.fastjson.JSON;
 public class FbsPuArrivalvouchController {
 	@Autowired
 	private IFbsPuArrivalvouchService fbsPuArrivalvouchService;
+	 @Value("${jeecg.path.upAnomalous}")
+	 private String upAnomalous;//异常质量信息图片路径
 
 	 /**
 	  * 收料待检(仓库管理看板)
@@ -465,6 +470,21 @@ public class FbsPuArrivalvouchController {
 		 Result<List<Map<String,Object>>> result=new Result<>();
 		 try {
 			 List<Map<String,Object>> map=fbsPuArrivalvouchService.getQualityUnpassList();
+
+			 for(Map<String,Object> m:map){
+				 ArrayList<String> list = new ArrayList<>();
+				 ArrayList<String> list2 = new ArrayList<>();
+				 String par = FileList.getAllFileName(upAnomalous+m.get("cinvcode"),list);
+				 if(par.equals("true")){
+
+				 	for(String L:list){
+				 		L = m.get("cinvcode")+ "/" + L;
+						list2.add(L);
+					}
+				 	m.put("images",list2);
+				 }
+			 }
+
 			 result.setResult(map);
 			 result.success("操作成功");
 		 } catch (Exception e) {

+ 1 - 0
src/main/resources/application-prod.yml

@@ -132,6 +132,7 @@ jeecg :
     upvedioAAA: D:/phoebus-web/board/upVedio/AAA
     upvedioABB: D:/phoebus-web/board/upVedio/ABB
     uppersonnel: D:/phoebus-web/board/upPersonnel/
+    upAnomalous: D:/phoebus-web/board/upAnomalous/
     #webapp文件路径
     webapp: D://webapp
 logging: