Browse Source

更新错误信息列表

baihe 3 years ago
parent
commit
87275d334f

+ 10 - 8
application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -1288,16 +1288,18 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                 searchReq = new SearchAbnormalReq();
                 searchReq.setWorkshopId(abnormalWorkshopInfo.getWorkshopId());
                 List<AbnormalItemRes> abnormalItemList = preventMistakeMapper.getFaAbnormalItemList(searchReq);
-
                 for (AbnormalItemRes abnormalItemInfo : abnormalItemList) {
-                    List<AbnormalItemResultRes> firstItemResultList = this.getAbnormalItemResultList(faInfo.getTaskId(), abnormalItemInfo.getItemId(), 0);
-                    abnormalItemInfo.setFirstItemResultList(firstItemResultList);
-
-                    List<AbnormalItemResultRes> twoHundredItemResultList = this.getAbnormalItemResultList(faInfo.getTaskId(), abnormalItemInfo.getItemId(), 1);
-                    abnormalItemInfo.setTwoHundredItemResultList(twoHundredItemResultList);
+                	
+					List<AbnormalItemResultRes> firstItemResultList = this.getAbnormalItemResultList(faInfo.getTaskId(),
+							abnormalItemInfo.getItemId(), faInfo.getTypeFlag());
+					if (faInfo.getTypeFlag() == 0) {
+						abnormalItemInfo.setFirstItemResultList(firstItemResultList);
+					} else if (faInfo.getTypeFlag() == 1) {
+						abnormalItemInfo.setTwoHundredItemResultList(firstItemResultList);
+					} else if (faInfo.getTypeFlag() == 2) {
+						abnormalItemInfo.setCatchItemResultList(firstItemResultList);
+					}
 
-                    List<AbnormalItemResultRes> catchItemResultList = this.getAbnormalItemResultList(faInfo.getTaskId(), abnormalItemInfo.getItemId(), 2);
-                    abnormalItemInfo.setCatchItemResultList(catchItemResultList);
                 }
 
                 abnormalWorkshopInfo.setAbnormalItemList(abnormalItemList);