|
|
@@ -63,9 +63,12 @@ public class QualityCheckFCServiceImpl implements QualityCheckFCService {
|
|
63
|
63
|
|
|
64
|
64
|
for (Map<String, Object> quality : list) {
|
|
65
|
65
|
List<Map<String, Object>> storageQualitycheckSon = qualitycheckSonService.selectByQualitycheckId(quality.get("id").toString());
|
|
66
|
|
- for (Map<String, Object> son : storageQualitycheckSon) {
|
|
67
|
|
- quality.putAll(son);
|
|
|
66
|
+ if(storageQualitycheckSon.size()>1){
|
|
|
67
|
+ for (Map<String, Object> son : storageQualitycheckSon) {
|
|
|
68
|
+ quality.putAll(son);
|
|
|
69
|
+ }
|
|
68
|
70
|
}
|
|
|
71
|
+
|
|
69
|
72
|
}
|
|
70
|
73
|
|
|
71
|
74
|
result.put("qualitycheckData", list);
|