接口-添加存储异常信息

application-facade/src/main/java/com/factory/web/entity/fa/FirstArticleItemResult.java

@@ -64,4 +64,6 @@ public class FirstArticleItemResult implements Serializable {
 	@ApiModelProperty(value = "工具")
 	private String toolDesc;
 
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
 }

application-facade/src/main/java/com/factory/web/entity/fa/req/AddFaItemResultReq.java

@@ -49,5 +49,8 @@ public class AddFaItemResultReq {
 
 	@ApiModelProperty(value = "工具")
 	private String toolDesc;
+	
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
 
 }

application-facade/src/main/java/com/factory/web/entity/fa/req/EditFaItemResultReq.java

@@ -49,4 +49,8 @@ public class EditFaItemResultReq {
 
 	@ApiModelProperty(value = "工具")
 	private String toolDesc;
+	
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
+	
 }

application-facade/src/main/java/com/factory/web/entity/fa/res/FaItemListForPadRes.java

@@ -102,4 +102,7 @@ public class FaItemListForPadRes implements Serializable {
 
 	@ApiModelProperty(value = "检查结果-工具")
 	private String toolDescCheck;
+	
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
 }

application-facade/src/main/java/com/factory/web/entity/fa/res/FaItemNoGoListRes.java

@@ -106,5 +106,8 @@ public class FaItemNoGoListRes implements Serializable {
 
 	@ApiModelProperty(value = "检查结果-工具")
 	private String toolDescCheck;
+	
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
 
 }

application-facade/src/main/java/com/factory/web/entity/pm/OnsiteItem.java

@@ -45,4 +45,9 @@ public class OnsiteItem implements Serializable {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "0通过 1巡检不通过 2没有巡检")
 	private Integer result;
+	
+	@TableField(exist = false)
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
+
 }

application-facade/src/main/java/com/factory/web/entity/pm/OnsiteItemResult.java

@@ -42,6 +42,9 @@ public class OnsiteItemResult implements Serializable {
 	@ApiModelProperty(value = "0通过 1巡检不通过 2没有巡检")
 	private Integer result;
 	
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
+	
 	@TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建人")
     private Long createdUserId;

application-facade/src/main/java/com/factory/web/entity/pm/req/AddItemResultReq.java

@@ -28,4 +28,7 @@ public class AddItemResultReq {
 
 	@ApiModelProperty(value = "0通过 1巡检不通过 2没有巡检")
 	private Integer result;
+	
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
 }

application-facade/src/main/java/com/factory/web/entity/pm/req/EditItemResultReq.java

@@ -28,4 +28,7 @@ public class EditItemResultReq {
 
 	@ApiModelProperty(value = "0通过 1巡检不通过 2没有巡检")
 	private Integer result;
+	
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
 }

application-facade/src/main/java/com/factory/web/entity/pm/res/AbnormalItemRes.java

@@ -37,6 +37,9 @@ public class AbnormalItemRes implements Serializable {
 	@ApiModelProperty(value = "防错检查结果：0通过 1巡检不通过 2没有巡检")
 	private Integer result;
 	
+	@ApiModelProperty(value = "防错异常信息")
+	private String abnormal;
+	
 	@ApiModelProperty(value = "判断标准")
 	private String itemStandard;
 	

application-facade/src/main/java/com/factory/web/entity/pm/res/AbnormalItemResultRes.java

@@ -49,5 +49,8 @@ public class AbnormalItemResultRes implements Serializable {
 
 	@ApiModelProperty(value = "工具")
 	private String toolDesc;
+	
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
 
 }

application-facade/src/main/java/com/factory/web/entity/pm/res/PmItemNoGoListRes.java

@@ -34,5 +34,8 @@ public class PmItemNoGoListRes implements Serializable {
 	
 	@ApiModelProperty(value = "0通过 1巡检不通过 2没有巡检")
 	private Integer result;
+	
+	@ApiModelProperty(value = "异常信息")
+	private String abnormal;
 
 }

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -779,6 +779,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     itemInfo.setValCheck(firstArticleItemResult.getVal());
                     itemInfo.setValDescCheck(firstArticleItemResult.getValDesc());
                     itemInfo.setToolDescCheck(firstArticleItemResult.getToolDesc());
+                    itemInfo.setAbnormal(firstArticleItemResult.getAbnormal());
                 }
 
                 listRes.add(itemInfo);
@@ -864,6 +865,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     .prefix(addFaItemResult.getPrefix())
                     .sno(addFaItemResult.getSno())
                     .toolDesc(addFaItemResult.getToolDesc())
+                    .abnormal(addFaItemResult.getAbnormal())
                     .build();
             firstArticleItemResultService.save(firstArticleItemResult);
         }
@@ -1009,6 +1011,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     .prefix(editFaItemResult.getPrefix())
                     .sno(editFaItemResult.getSno())
                     .toolDesc(editFaItemResult.getToolDesc())
+                    .abnormal(editFaItemResult.getAbnormal())
                     .build();
             firstArticleItemResultService.updateById(firstArticleItemResult);
         }

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

@@ -830,6 +830,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
         			.eq(OnsiteItemResult::getOnsiteItemId, onsiteItem.getId()));
     		if (onsiteItemResult != null) {
     			onsiteItem.setResult(onsiteItemResult.getResult());
+    			onsiteItem.setAbnormal(onsiteItemResult.getAbnormal());
     		}
     	}
 
@@ -861,6 +862,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     				.onsiteTaskId(req.getOnsiteTaskId())
     				.onsiteItemId(addItemResult.getOnsiteItemId())
     				.result(addItemResult.getResult())
+    				.abnormal(addItemResult.getAbnormal())
     				.build();
     		onsiteItemResultService.save(onsiteItemResult);
     	}
@@ -1038,6 +1040,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     				.onsiteTaskId(req.getOnsiteTaskId())
     				.onsiteItemId(editItemResult.getOnsiteItemId())
     				.result(editItemResult.getResult())
+    				.abnormal(editItemResult.getAbnormal())
     				.build();
     		onsiteItemResultService.save(onsiteItemResult);
     	}

application-facade/src/main/resources/mapper/FirstArticleMapper.xml

@@ -177,6 +177,7 @@
 			fair.val_desc AS val_desc_check,
 			fair.result,
 			fair.tool_desc AS tool_desc_check,
+			fair.abnormal,
 			fai.workshop_id,
 			fai.item_content,
 			fai.item_standard,
@@ -292,7 +293,8 @@
 			   fair.val,
 			   fair.val_desc,
 			   fair.prefix,
-			   fair.tool_desc
+			   fair.tool_desc,
+			   fair.abnormal
 		FROM   first_article_item_result fair,
 			   first_article_task fat,
 			   first_article_item fai

application-facade/src/main/resources/mapper/PreventMistakeMapper.xml

@@ -243,7 +243,8 @@
         SELECT
 			oir.onsite_item_id,
 			oi.item_content,
-			oir.result
+			oir.result,
+			oir.abnormal
 		FROM
 			onsite_item_result oir,
 			onsite_task ot,
@@ -420,7 +421,8 @@
     <select id="getPmAbnormalItemList" resultType="com.factory.web.entity.pm.res.AbnormalItemRes">
         SELECT  oir.onsite_item_id AS item_id,
 		        oi.item_content,
-				oir.result
+				oir.result,
+				oir.abnormal
 		FROM    onsite_item_result oir,
 		        onsite_item oi
 		WHERE   oir.onsite_item_id = oi.id
@@ -521,7 +523,8 @@
 			fair.val,
 			fair.val_desc,
 			fair.result,
-			fair.tool_desc 
+			fair.tool_desc,
+			fair.abnormal 
 		FROM
 			first_article_item_result fair,
 			first_article_item fai