app

src/main/java/com/chinaitop/depot/storage/controller/StorageFoodbasicInfoController.java

@@ -140,30 +140,33 @@ public class StorageFoodbasicInfoController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", paramType = "query")
     })
-    public StorageFoodbasicinfo loadDataById(Integer id) throws Exception{
+    public Map<String, Object> loadDataById(Integer id) throws Exception{
         if(id != null && !"".equals(id)){
-        	StorageFoodbasicinfo foodbasicinfo = foodbasicInfoService.loadDataById(id);
-            List<StorageFoodbasicinfo>  list = foodbasicInfoService.getByHouseIdAndWarehouseId(foodbasicinfo);
+            Map<String,Object> foodbasicinfo = new HashMap<String,Object>();
+        	StorageFoodbasicinfo rep = foodbasicInfoService.loadDataById(id);
+            List<StorageFoodbasicinfo>  list = foodbasicInfoService.getByHouseIdAndWarehouseId(rep);
 			if (list.size() > 0 && list != null){
 
-                foodbasicinfo = list.get(0);
-
-                List<StorageQualitycheckSon> SqsList =  qualitycheckSonService.getQualitycheckSonByFoodbasicinfoCheck(list.get(0).getId());
-                for(StorageQualitycheckSon sqk : SqsList){
-                    if(sqk.getNumbering()== 6996 ){
-                        foodbasicinfo.setFatIndex(sqk.getSetValue());
-                        continue;
-                    }
-                    if(sqk.getNumbering() == 6995 ){
-                        foodbasicinfo.setPeroxideValue(sqk.getSetValue());
-                        continue;
-                    }
-
-                }
+                rep = list.get(0);
+                Map<String, Object> qualitycheckSon = qualitycheckSonService.findQualitycheckSon(list.get(0).getSqkid());
+                foodbasicinfo.put("foodbasicinfo",rep);
+                foodbasicinfo.put("qualitycheckSon",qualitycheckSon);
+//                List<StorageQualitycheckSon> SqsList =  qualitycheckSonService.getQualitycheckSonByFoodbasicinfoCheck(list.get(0).getId());
+//                for(StorageQualitycheckSon sqk : SqsList){
+//                    if(sqk.getNumbering()== 6996 ){
+//                        foodbasicinfo.setFatIndex(sqk.getSetValue());
+//                        continue;
+//                    }
+//                    if(sqk.getNumbering() == 6995 ){
+//                        foodbasicinfo.setPeroxideValue(sqk.getSetValue());
+//                        continue;
+//                    }
+//
+//                }
             }
             return foodbasicinfo;
         }else {
-            return new StorageFoodbasicinfo();
+            return null;
         }
     }