更新代码

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

@@ -56,4 +56,7 @@ public class FaPlanRes implements Serializable {
     @ApiModelProperty(value = "文件名")
     private String fileNm;
 
+    @ApiModelProperty(value = "文件id")
+    private Integer url;
+
 }

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

@@ -337,10 +337,16 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         faPlanRes.setBentelerPlanName(plan.getName());
         faPlanRes.setPlanType(plan.getPlanType());
         faPlanRes.setEffectiveDate(plan.getEffectiveDate());
+        Integer fileId = plan.getFileId();
+        if (fileId != null) {
+            FileEntry file = fileService.getById(fileId);
+            faPlanRes.setUrl(fileId);
+            faPlanRes.setFileNm(Optional.ofNullable(file.getFileNm()).orElse(""));
+        }
 
         List<FirstArticleCalendar> firstArticleCalendarList = firstArticleCalendarService.list(Wrappers.<FirstArticleCalendar>lambdaQuery()
                 .eq(FirstArticleCalendar::getBentelerPlanId, plan.getId()));
-        
+
         faPlanRes.setFirstArticleCalendarList(firstArticleCalendarList);
 
         try {
@@ -1192,6 +1198,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                         .in(BentelerPlan::getStatus, PlanStatus.APPROVAL_PASS.value, PlanStatus.APPROVAL_FORMAL.value, PlanStatus.HISTORY.value)
                 );
             }
+
 //            List<PlanBind> bindList = planBindService.list(Wrappers.<PlanBind>lambdaQuery().eq(PlanBind::getOldBentelerPlanId, req.getId())
 //            		.select(PlanBind::getNewBentelerPlanId));
 //            List<Long> psids = new ArrayList<>();
@@ -1388,7 +1395,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         titleMap.put("iniCheckPrinciple", faCalendarList.stream().filter(item2 -> item2.getTypeFlag().equals(0)).findFirst().map(item3 -> item3.getCheckPerson()).orElse("无"));
         titleMap.put("twoCheckPrinciple", faCalendarList.stream().filter(item2 -> item2.getTypeFlag().equals(1)).findFirst().map(item3 -> item3.getCheckPerson()).orElse("无"));
         titleMap.put("breakCheckPrinciple", faCalendarList.stream().filter(item2 -> item2.getTypeFlag().equals(2)).findFirst().map(item3 -> item3.getCheckPerson()).orElse("无"));
-        AtomicReference<String> remarkStr = null;
+        AtomicReference<String> remarkStr = new AtomicReference<>();
 
         ArrayList<Map<String, String>> arrayList = new ArrayList<>();
 

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

@@ -4,10 +4,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -996,7 +993,13 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	@Override
 	public ResponseBean<List<PmCheckListRes>> getPmCheckList(SearchPmPlanReq req) {
 		List<PmCheckListRes> pmCheckList = preventMistakeMapper.getPmCheckList(req);
-    	return ResponseBeanBuilder.ok(pmCheckList, Function.identity());
+		List<Integer> types = Arrays.asList(0, 1, 2);
+		types.forEach(type -> {
+			if (pmCheckList.stream().noneMatch(item -> item.getTypeFlag().equals(type))) {
+				pmCheckList.add(PmCheckListRes.builder().typeFlag(type).build());
+			}
+		});
+		return ResponseBeanBuilder.ok(pmCheckList, Function.identity());
 	}
 
 	/**

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

@@ -565,7 +565,6 @@
         <if test="req.typeFlag == 2"> <!-- 中断 -->
             AND fai.catch_flag = 1
         </if>
-            AND
     </select>
 
     <!--取得PAD端工作站 -->