首件、防错，接口返回文件名信息

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

@@ -52,7 +52,10 @@ public class FaPlanRes implements Serializable {
 	@ApiModelProperty(value = "工作站及巡检内容")
 	private List<FirstArticleWorkshop> firstArticleWorkshopList;
 	
-	@ApiModelProperty(value = "文件信息")
-	private FileEntry fileEntry;
+//	@ApiModelProperty(value = "文件信息")
+//	private FileEntry fileEntry;
+	
+	@ApiModelProperty(value = "文件名")
+	private String fileNm;
 
 }

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

@@ -55,7 +55,10 @@ public class PmPlanRes implements Serializable {
 	@ApiModelProperty(value = "工作站及巡检内容")
 	private List<OnsiteWorkshop> onsiteWorkshopList;
 	
-	@ApiModelProperty(value = "文件信息")
-	private FileEntry fileEntry;
+//	@ApiModelProperty(value = "文件信息")
+//	private FileEntry fileEntry;
+	
+	@ApiModelProperty(value = "文件名")
+	private String fileNm;
 
 }

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

@@ -303,7 +303,9 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             
             /* 取得文件信息 */
             FileEntry fileEntry = fileService.getById(faPlanRes.getFirstArticleTitle().getUploadAttachmentId());
-            faPlanRes.setFileEntry(fileEntry);
+            if (fileEntry != null) {
+            	faPlanRes.setFileNm(fileEntry.getFileNm());
+            }
             
         } catch (Exception e) {
             // TODO Auto-generated catch block

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

@@ -421,7 +421,9 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 			/* 取得文件信息 */
             FileEntry fileEntry = fileService.getById(pmPlanRes.getOnsiteTitle().getUploadAttachmentId());
-            pmPlanRes.setFileEntry(fileEntry);
+            if (fileEntry != null) {
+            	pmPlanRes.setFileNm(fileEntry.getFileNm());
+            }
             
 		} catch (Exception e) {
 			// TODO Auto-generated catch block